更新前端src/views/locales目录文件

core/core-frontend/src/locales/en.ts

@@ -1,5 +1,17 @@
 export default {
   common: {
+    empty: ' ',
+    cross_source: 'Cross-source',
+    single_source: 'Single-source',
+    source_tips:
+      'The data set is cross-source. Please check the syntax of other SQL nodes to confirm whether the type should be changed to single-source?',
+    associated_chart: 'Associated chart',
+    associated_chart_first: 'First level associated chart',
+    changing_the_display:
+      'Changing the display type will clear the drop-down tree related settings. Are you sure?',
+    other_levels:
+      'Except for level 1, no query condition configuration is required for other levels',
+    tree_structure: 'The drop-down tree structure cannot be empty',
     component: {
       input: 'Input',
       textarea: 'Textarea',
@@ -10,6 +22,8 @@ export default {
       dateRange: 'Date Range Picker',
       add_component_hint: 'Click or drag the component on the left to add a field'
     },
+    local_excel: 'Local Excel/CSV',
+    remote_excel: 'Remote Excel/CSV',
     list_selection: 'List selection',
     date_setting: 'Date setting',
     openMobileTerminal: 'Open mobile terminal',
@@ -99,7 +113,7 @@ export default {
   },
   operate_log: {
     name: 'Operation log',
-    search_by_operate_info: 'Search by operation details',
+    search_by_operate_info: 'Search by operation target',
     detail: 'Operation details',
     type: 'Operation type',
     status: 'Operation status',
@@ -368,6 +382,7 @@ export default {
     lweek: 'Last week',
     cmonth: 'This month',
     cquarter: 'This quarter',
+    tquarter: 'This quarter',
     lquarter: 'Last quarter',
     cyear: 'This year'
   },
@@ -706,7 +721,8 @@ export default {
     upload_a_cover: 'Please upload a cover',
     edit_theme: 'Edit theme',
     cover: 'Cover',
-    to_delete_: 'Are you sure you want to delete [{0}]?'
+    to_delete_: 'Are you sure you want to delete [{0}]?',
+    to_delete_variable: 'Are you sure you want to delete {0}?'
   },
   user: {
     change_password: 'Change Password',
@@ -958,7 +974,7 @@ export default {
     auth_method: 'Authentication Method',
     passwd: 'Username and Password',
     kerbers_info:
-      'Please make sure krb5.Conf, Keytab Key, have been added to the path: /opt/gisbi/conf',
+      'Please make sure krb5.Conf, Keytab Key, have been added to the path: /opt/dataease2.0/conf',
     client_principal: 'Client Principal',
     keytab_Key_path: 'Keytab Key Path',
     please_select_left: 'Please select from the left',
@@ -1077,6 +1093,7 @@ export default {
     has_repeat_field_name: 'Duplicate field name, please modify before selecting',
     primary_key_change: 'Primary key cannot be changed:',
     api_field_not_empty: 'Field cannot be empty',
+    file_not_empty: 'File cannot be empty',
     success_copy: 'Copy successfully',
     valid: 'Valid',
     invalid: 'Invalid',
@@ -1138,7 +1155,12 @@ export default {
     table_id: 'table_id',
     input_table_id: 'Please select a data table',
     view_id: 'view_id',
-    input_view_id: 'Please select a view'
+    input_view_id: 'Please select a view',
+    remote_excel_url: 'Remote Excel/CSV Address',
+    remote_excel_url_placeholder:
+      'Please enter the remote Excel/CSV address, for example, ftp://192.168.1.101/files/data.xlsx',
+    remote_excel_url_empty: 'Please enter the remote Excel/CSV address',
+    load_data: 'Load Data'
   },
   chart: {
     align: 'Alignment',
@@ -1364,6 +1386,7 @@ export default {
     table_title_fontsize: 'Header font size',
     table_item_fontsize: 'Table font size',
     table_header_bg: 'Header Bg',
+    table_header_row_bg: 'Header&Row Bg',
     table_item_bg: 'Table Bg',
     table_header_font_color: 'Header font',
     table_item_font_color: 'Table font',
@@ -1373,6 +1396,7 @@ export default {
     table_show_col_tooltip: 'Turn on column header tooltip',
     table_show_cell_tooltip: 'Turn on cell tooltip',
     table_show_header_tooltip: 'Turn on header tooltip',
+    table_summary: 'Total',
     table_show_summary: 'Show total',
     table_summary_label: 'Total label',
     table_header_show_horizon_border: 'Header horizontal border',
@@ -1432,7 +1456,12 @@ export default {
     y_W: 'Year Week',
     y_M_d: 'Year Month Day',
     M_d: 'Month Day',
+    M: 'Month',
+    d: 'Day',
+    H: 'Hours',
+    H_m: 'Hours Minutes',
     H_m_s: 'Hours Minutes Seconds',
+    y_M_d_H: 'Year Month Day Hours',
     y_M_d_H_m: 'Year Month Day Hours Minutes',
     y_M_d_H_m_s: 'Year Month Day Hours Minutes Seconds',
     date_sub: 'yyyy-MM-dd',
@@ -1714,6 +1743,9 @@ export default {
     value_formatter_value: 'Number',
     value_formatter_percent: 'Percentage',
     value_formatter_unit: 'Unit',
+    value_formatter_unit_language: 'Language',
+    value_formatter_unit_language_ch: 'Chinese',
+    value_formatter_unit_language_en: 'English',
     value_formatter_decimal_count: 'Number of decimal places',
     value_formatter_suffix: 'Unit suffix',
     show_gap: 'Show interval value',
@@ -1814,12 +1846,12 @@ export default {
     axis_tip:
       'Minimum value, maximum value, and interval are all numeric types; if not filled in, this item will be considered automatic. <br/>Please make sure that the filled value can be calculated correctly, otherwise the axis value will not be displayed normally. ',
     format_tip: `The template variables are {a}, {b}, {c}, {d}, which represent the series name, data name, data value, etc. <br>
-When the trigger position is 'coordinate axis', there will be multiple series of data. At this time, the index of the series can be represented by {a0}, {a1}, {a2} followed by an index. <br>
+      When the trigger position is 'coordinate axis', there will be multiple series of data. At this time, the index of the series can be represented by {a0}, {a1}, {a2} followed by an index. <br>
-The meanings of {a}, {b}, {c}, {d} in different chart types are different. The variables {a}, {b}, {c}, {d} represent the data meanings in different chart types: <br><br>
+      The meanings of {a}, {b}, {c}, {d} in different chart types are different. The variables {a}, {b}, {c}, {d} represent the data meanings in different chart types: <br><br>
-Line (area) chart, column (bar) chart, dashboard: {a} (series name), {b} (category value), {c} (value) <br>
+      Line (area) chart, column (bar) chart, dashboard: {a} (series name), {b} (category value), {c} (value) <br>
-Pie chart, funnel chart: {a} (series name), {b} (data item name), {c} (value), {d} (percentage) <br>
+      Pie chart, funnel chart: {a} (series name), {b} (data item name), {c} (value), {d} (percentage) <br>
-Map: {a} (series name), {b} (area name), {c} (combined value), {d} (none) <br>
+      Map: {a} (series name), {b} (area name), {c} (combined value), {d} (none) <br>
-Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value array), {d} (none)`,
+      Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value array), {d} (none)`,
     h_position: 'Horizontal position',
     v_position: 'Vertical position',
     p_left: 'Left alignment',
@@ -1912,6 +1944,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     radiusColumnBar: 'Column',
     rightAngle: 'Right angle',
     roundAngle: 'Rounded angle',
+    topRoundAngle: 'Top rounded angle',
     table_layout_mode: 'Display form',
     table_layout_grid: 'Tile display',
     table_layout_tree: 'Tree display',
@@ -1955,7 +1988,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     radar_area_color: 'Enable area',
     table_freeze_tip: 'After merging cells, column and row freezing is not supported',
     merge_cells_tips:
-      'After merging cells, row and column freezing, automatic line wrapping, and zebra pattern will become invalid',
+      'After merging cells, row and column freezing, automatic line wrapping, and zebra pattern will become invalid, the serial number of the current page will start from 1',
     merge_cells_break_line_tip: 'After merging cells, automatic line wrapping is not supported',
     font_family_ya_hei: 'Microsoft YaHei',
     font_family_song_ti: 'SimSun',
@@ -2031,11 +2064,35 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     increase: 'Increase',
     decrease: 'Decrease',
     accumulate: 'Accumulate',
-    table_cross_bg_tip: 'After merging cells，the zebra pattern is not supported',
+    table_cross_bg_tip: 'After merging cells, the zebra pattern is not supported',
     pivot_export_invalid_field:
       'The row dimension or indicator dimension is empty and can not be exported !',
     pivot_export_invalid_col_exceed:
-      'Table can not be exported cause the number of columns exceeds the maximum limit!'
+      'Table can not be exported cause the number of columns exceeds the maximum limit!',
+    expand_all: 'Expand all',
+    level_label: 'Level {num}',
+    default_expand_level: 'Default expand level',
+    no_data_or_not_positive: 'No data available, or all data are not positive, unable to plot',
+    map_type: 'Map Provider',
+    map_type_gaode: 'Gaode Map',
+    map_type_tianditu: 'Tianditu',
+    map_type_baidu: 'Baidu Map',
+    map_type_tencent: 'Tencent Map',
+    bullet_chart: 'Bullet Chart',
+    range_bg: 'Range Background',
+    legend_name: 'Legend Name',
+    threshold_value: 'Threshold Value',
+    range_num: 'Number of Range',
+    show_range_bg: 'Show Range Background',
+    last_item: 'Last item',
+    legend_sort: 'Legend Sort',
+    quota_position: 'Quota Position',
+    quota_position_col: 'Column',
+    quota_position_row: 'Row',
+    quota_col_label: 'Quota Column Label',
+    table_grand_total_label: 'Total Alias',
+    table_field_total_label: 'Field Alias',
+    table_row_header_freeze: 'Row Header Freeze'
   },
   dataset: {
     field_value: 'Field Value',
@@ -2051,7 +2108,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     select_year: 'Select year',
     sql_variable_limit_1: '1. SQL variables can only be used in WHERE conditions',
     sql_variable_limit_2:
-      "2. Example: select * from table_name where col_name1='${'{'}param_name1{'}'}' and col_name2 in (${'{'}param_name2{'}'})",
+      "2. select * from table where $DE_PARAM{'{'} name = substring('$[PARAM1]',1,5){'}'} and $DE_PARAM{'{'} name in ($[PARAM2]) {'}'}",
     select_month: 'Select month',
     select_date: 'Select date',
     select_time: 'Select time',
@@ -2409,9 +2466,11 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     Professional: 'Professional Edition',
     Embedded: 'Embedded Edition',
     support: 'Get technical support',
-    update_success: 'Update successful',
+    update_success: 'Update successful, please log in again',
     serial_no: 'Serial number',
-    remark: 'Remark'
+    remark: 'Remark',
+    back_community: 'Revert to Community Edition',
+    confirm_tips: 'Are you sure you want to restore to the community edition? '
   },
   cron: {
     second: 'Seconds',
@@ -2727,7 +2786,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
       no_children_text: 'No child nodes',
       no_options_text: 'No available options',
       no_results_text: 'No matching results'
-    }
+    },
+    char_count_limit: 'Cannot exceed {count} characters'
   },
   sql_variable: {
     variable_mgm: 'Parameter settings'
@@ -2738,7 +2798,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     msg_center: 'Message center',
     to_be_filled: 'To be filled',
     the_minimum_value:
-      'The maximum value of the numerical interval must be greater than the minimum value',
+      'The maximum value of the numerical interval must be greater than or equal to the minimum value',
     before_querying:
       'The query condition is required, please set the option value before querying! ',
     here_or_click: 'Drag the field on the right here or click',
@@ -2845,6 +2905,28 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     column_name: 'Field name'
   },
   visualization: {
+    support_query: 'Only query components can be added',
+    publish_update_tips: 'Update available',
+    filter_freeze_tips:
+      'A pinned query component already exists. Confirm switching to this component?',
+    query_position: 'Query Component Position',
+    default: 'Default',
+    to_top: 'Pin to Top',
+    publish_recover: 'Revert Publish',
+    publish_tips1: 'Visible after publication',
+    publish_tips2: 'Available after publication {0}',
+    cancel_publish_tips: 'Successfully unpublished',
+    resource_not_published: 'Resource not published',
+    re_publish: 'Republish',
+    published_success: 'Published successfully',
+    cancel_publish: 'Cancel Publish',
+    publish: 'Publish',
+    freeze_top: 'Position frozen at the top',
+    indicator_linkage: 'Indicator card linkage only carries chart filtering parameters',
+    gap_size: 'Gap Size',
+    small: 'Small',
+    middle: 'Medium',
+    large: 'Large',
     no_details: 'No Data',
     sync_pc_design: 'Synchronize PC Design',
     title_background: 'Title Background',
@@ -2896,6 +2978,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
       'If the query button is displayed, the chart query will be triggered only after clicking the button. If not displayed, the query is triggered immediately after selecting the query conditions.',
     custom_query_bg_color: 'Custom Query Background Color',
     query_condition_space: 'Query Condition Spacing',
+    query_condition_height: 'Query condition height',
     query_condition_name: 'Query Condition Name',
     condition_left: 'Left Side',
     condition_top: 'Top Side',
@@ -2981,7 +3064,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     dashboard_configuration: 'Dashboard Configuration',
     batch_style_set: 'Batch Style Setting',
     pic_import_tips: 'Supports JPG, PNG, GIF, SVG, size not exceeding {0}',
-    pic_size_error: 'Image size does not match',
+    pic_size_error: 'The image size cannot exceed 15MB',
     re_upload: 'Re-upload',
     screen_configuration: 'Screen Configuration',
     mobile_ios_tips: 'May not display on IOS',
@@ -3003,7 +3086,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     query: 'Query',
     carousel: 'Carousel',
     carousel_time: 'Carousel Time(s)',
-    carousel_tips: 'Carousel will only take effect after exiting edit mode',
+    carousel_tips: 'Carousel takes effect after exiting edit mode',
     carousel_tips2: 'Carousel will be disabled after enabling conditional styling',
     background: 'Background',
     tab_title: 'Tab Title',
@@ -3015,12 +3098,13 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     board_radius: 'Border Radius',
     enable_event_binding: 'Enable Event Binding',
     event_binding_tips:
-      'Event binding will take effect after exiting edit mode. If rich text has event binding enabled, internal click events will be disabled',
+      'Event bindings will take effect after exiting edit mode. When rich text have event binding enabled, their internal click events will be disabled.',
     input_url_tips: 'Please enter the redirect URL',
     edit_title: 'Edit Title',
     custom_sort: 'Custom Sort',
     show_date: 'Show Date',
     show_time: 'Show Time',
+    show_week: 'Show Week',
     link_info: 'Link Information',
     pic_upload_tips: 'Please upload an image...',
     pic_group: 'Image Group',
@@ -3183,7 +3267,6 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     space_left: 'Left',
     space_width: 'Width',
     space_height: 'Height',
-    to_top: 'Move to Top',
     down: 'Download',
     mobile_style_setting: 'Style Setting',
     mobile_style_setting_tips: 'Customize mobile background',
@@ -3222,7 +3305,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     apply: 'Apply',
     apply_this_template: 'Apply This Template',
     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...',
+      'To view templates from the template market, your server must be connected to the template market ({0}). Please check your network connection...',
     enter_name_tips: 'Please enter the dashboard name.',
     apply_template: 'App Template',
     style_template: 'Style Template',
@@ -3631,7 +3714,15 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
       'Unit: minutes, range: [0-1440], 0 means no time limit, starting from the first access using the ticket',
     arg_val_tips: 'Please enter parameter values',
     arg_format_tips:
-      'Please use JSON format string, example single valued argVal, multi valued [argVal1, argVal2]'
+      'Please use JSON array format, example single valued [argVal], multi valued [argVal1, argVal2]',
+    param_error: 'Ticket parameter error!',
+    exp_error: 'Ticket has expired!',
+    disable_error: 'Sharing feature has been disabled, please contact administrator!',
+    pe_require_error: 'Expiration password is required, current link is invalid!',
+    iframe_error:
+      'Only embedded version and enterprise version support iframe embedding of public links!',
+    link_error: 'Link does not exist!',
+    link_exp_error: 'Link has expired!'
   },
   pblink: {
     key_pwd: 'Please enter the password to open the link',
@@ -3755,7 +3846,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     auth_method: 'Authentication method',
     passwd: 'Username and password',
     kerbers_info:
-      'Please make sure krb5.Conf and Keytab Key have been added to the path: /opt/gisbi/conf',
+      'Please make sure krb5.Conf and Keytab Key have been added to the path: /opt/dataease2.0/conf',
     client_principal: 'Client Principal',
     keytab_Key_path: 'Keytab Key Path',
     data_base: 'Database name',
@@ -4136,7 +4227,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
       '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 reports',
+    my_job: 'My data filling task',
+    short_name: 'Task',
     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:
@@ -4144,6 +4236,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     todo: 'To be filled',
     finished: 'Filled',
     expired: 'Expired',
+    all: 'All',
     required_select: 'Required',
     condition: 'Filter value',
     add_condition: 'Add condition',
@@ -4314,6 +4407,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
       download: 'Download',
       download_template: 'Download template',
       insert_data: 'Insert data',
+      batch_insert_data: ' Batch insert data',
+      batch_insert_data_with_count: 'Batch insert data，total count: {0}',
       update_data: 'Update data',
       delete_data: 'Delete data',
       recent_committer: 'Recent committer',
@@ -4324,6 +4419,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
       data_not_found: '] does not exist'
     },
     task: {
+      commit_operate_type: 'Commit type',
+      committer: 'Committer',
       time_check_5_minute_later_than_current:
         'Cannot be less than 5 minutes after the current time',
       time_check_later_than_current: 'Cannot be less than the current time',

core/core-frontend/src/locales/tw.ts

@@ -1,5 +1,14 @@
 export default {
   common: {
+    empty: '',
+    cross_source: '跨源',
+    single_source: '單源',
+    source_tips: '資料集存在跨源情況，請檢查其他 SQL 節點的語法，是否確認將類型改為單源?',
+    other_levels: '除層級一外,其他層級無須進行查詢條件配置',
+    tree_structure: '下拉樹的結構不能為空',
+    associated_chart: '關聯圖表',
+    changing_the_display: '更改展示類型將會清除下拉樹相關設定,是否確定?',
+    associated_chart_first: '第一層級已關聯圖表',
     component: {
       input: '單行輸入',
       textarea: '多行輸入',
@@ -10,6 +19,8 @@ export default {
       dateRange: '時間範圍',
       add_component_hint: '點選或拖曳左側元件新增欄位'
     },
+    local_excel: '本地 Excel/CSV',
+    remote_excel: '遠端 Excel/CSV',
     list_selection: '清單選擇',
     date_setting: '日期設定',
     openMobileTerminal: '開啟行動端',
@@ -99,7 +110,7 @@ export default {
   },
   operate_log: {
     name: '操作日誌',
-    search_by_operate_info: '透過操作詳情搜尋',
+    search_by_operate_info: '透過操作對象搜尋',
     detail: '操作詳情',
     type: '操作類型',
     status: '操作狀態',
@@ -359,6 +370,7 @@ export default {
     lweek: '上週',
     cmonth: '本月',
     cquarter: '本季',
+    tquarter: '本季',
     lquarter: '上季',
     cyear: '本年'
   },
@@ -684,7 +696,8 @@ export default {
     upload_a_cover: '請上傳封面',
     edit_theme: '編輯主題',
     cover: '封面',
-    to_delete_: '確定刪除[{0}]嗎?'
+    to_delete_: '確定刪除[{0}]嗎?',
+    to_delete_variable: '確定刪除 {0} 嗎?'
   },
   user: {
     change_password: '修改密碼',
@@ -927,7 +940,7 @@ export default {
     data_source_table: '資料來源表',
     auth_method: '認證方式',
     passwd: '使用者名稱密碼',
-    kerbers_info: '請確保krb5.Conf、Keytab Key，已新增至路徑：/opt/gisbi/conf',
+    kerbers_info: '請確保krb5.Conf、Keytab Key，已新增至路徑：/opt/dataease2.0/conf',
     client_principal: 'Client Principal',
     keytab_Key_path: 'Keytab Key Path',
     please_select_left: '請從左邊選擇',
@@ -1041,6 +1054,7 @@ export default {
     has_repeat_field_name: '欄位名稱重複，請修改後再選擇',
     primary_key_change: '主鍵不能改變:',
     api_field_not_empty: '欄位不能為空',
+    file_not_empty: '文件不能為空',
     success_copy: '複製成功',
     primary_key_length: '主鍵必須設置長度: ',
     valid: '有效',
@@ -1104,7 +1118,12 @@ export default {
     table_id: 'table_id',
     input_table_id: '請選擇數據表',
     view_id: 'view_id',
-    input_view_id: '請選擇視圖'
+    input_view_id: '請選擇視圖',
+    remote_excel_url: '遠端 Excel/CSV 地址',
+    remote_excel_url_placeholder:
+      '請輸入遠端 Excel/CSV 地址，例如 ftp://192.168.1.101/files/data.xlsx',
+    remote_excel_url_empty: '請輸入遠端 Excel/CSV 地址',
+    load_data: '載入資料'
   },
   chart: {
     align: '對齊方式',
@@ -1329,6 +1348,7 @@ export default {
     table_title_fontsize: '表頭字體大小',
     table_item_fontsize: '表格字體大小',
     table_header_bg: '表頭背景',
+    table_header_row_bg: '表頭/行背景',
     table_item_bg: '表格背景',
     table_header_font_color: '表頭字型',
     table_item_font_color: '表格字型',
@@ -1338,6 +1358,7 @@ export default {
     table_show_col_tooltip: '開啟列頭提示',
     table_show_cell_tooltip: '開啟單元格提示',
     table_show_header_tooltip: '開啟表頭提示',
+    table_summary: '總計',
     table_show_summary: '顯示總計',
     table_summary_label: '總計標籤',
     table_header_show_horizon_border: '表頭橫邊框線',
@@ -1397,7 +1418,12 @@ export default {
     y_W: '年周',
     y_M_d: '年月日',
     M_d: '月日',
+    M: '月',
+    d: '日',
+    H: '時',
+    H_m: '時分',
     H_m_s: '時分秒',
+    y_M_d_H: '年月日時',
     y_M_d_H_m: '年月日時分',
     y_M_d_H_m_s: '年月日時分秒',
     date_sub: 'yyyy-MM-dd',
@@ -1675,6 +1701,9 @@ export default {
     value_formatter_value: '數值',
     value_formatter_percent: '百分比',
     value_formatter_unit: '數量單位',
+    value_formatter_unit_language: '單位語言',
+    value_formatter_unit_language_ch: '中文',
+    value_formatter_unit_language_en: '英文',
     value_formatter_decimal_count: '小數位數',
     value_formatter_suffix: '單位字尾',
     show_gap: '顯示間隔值',
@@ -1771,12 +1800,12 @@ export default {
     axis_tip:
       '最小值、最大值、間隔均為數值類型；若不填，則該項視為自動。 <br/>請確保填入數值能正確計算，否則將無法正常顯示軸值。 ',
     format_tip: `模板變數有{a}, {b}，{c}，{d}，分別表示系列名，資料名，資料值等。 <br>
-在觸發位置為'座標軸' 的時候，會有多個系列的數據，此時可以透過{a0}, {a1}, {a2} 這種後面加索引的方式表示系列的索引。 <br>
+      在觸發位置為'座標軸' 的時候，會有多個系列的數據，此時可以透過{a0}, {a1}, {a2} 這種後面加索引的方式表示系列的索引。 <br>
-不同圖表類型下的{a}，{b}，{c}，{d} 意義不一樣。 其中變數{a}, {b}, {c}, {d}在不同圖表類型下代表資料意義為：<br><br>
+      不同圖表類型下的{a}，{b}，{c}，{d} 意義不一樣。 其中變數{a}, {b}, {c}, {d}在不同圖表類型下代表資料意義為：<br><br>
-折線（區域）圖、柱狀（長條）圖、儀錶板: {a}（系列名稱），{b}（類目值），{c}（數值）<br>
+      折線（區域）圖、柱狀（長條）圖、儀錶板: {a}（系列名稱），{b}（類目值），{c}（數值）<br>
-圓餅圖、漏斗圖: {a}（系列名稱），{b}（資料項名稱），{c}（數值）, {d}（百分比）<br>
+      圓餅圖、漏斗圖: {a}（系列名稱），{b}（資料項名稱），{c}（數值）, {d}（百分比）<br>
-地圖: {a}（系列名稱），{b}（區域名稱），{c}（合併數值）, {d}（無）<br>
+      地圖: {a}（系列名稱），{b}（區域名稱），{c}（合併數值）, {d}（無）<br>
-散佈圖（氣泡）圖: {a}（系列名稱），{b}（資料名稱），{c}（數值陣列）, {d}（無）`,
+      散佈圖（氣泡）圖: {a}（系列名稱），{b}（資料名稱），{c}（數值陣列）, {d}（無）`,
     h_position: '水平位置',
     v_position: '垂直位置',
     p_left: '左對齊',
@@ -1864,6 +1893,7 @@ export default {
     radiusColumnBar: '柱形',
     rightAngle: '直角',
     roundAngle: '圓角',
+    topRoundAngle: '頂部圓角',
     table_layout_mode: '展示形式',
     table_layout_grid: '平鋪展示',
     table_layout_tree: '樹形展示',
@@ -1905,7 +1935,7 @@ export default {
     radar_point_size: '輔助點大小',
     radar_area_color: '開啟面積',
     table_freeze_tip: '合併儲存格後，不支持行列凍結',
-    merge_cells_tips: '合併儲存格後，行列凍結、自動換行、班馬紋會失效',
+    merge_cells_tips: '合併儲存格後，行列凍結、自動換行、班馬紋會失效，當前頁的序號會從 1 開始',
     merge_cells_break_line_tip: '合併儲存格後，不支持自動換行',
     font_family_ya_hei: '微軟雅黙',
     font_family_song_ti: '宋體',
@@ -1979,7 +2009,31 @@ export default {
     accumulate: '累加',
     table_cross_bg_tip: '合併儲存格後，不支持斑馬紋',
     pivot_export_invalid_field: '行維度或指標維度為空不可導出！',
-    pivot_export_invalid_col_exceed: '表格列數超過最大限制不可導出!'
+    pivot_export_invalid_col_exceed: '表格列數超過最大限制不可導出!',
+    expand_all: '全展開',
+    level_label: '第{num}層級',
+    default_expand_level: '默認展開層級',
+    no_data_or_not_positive: '暫無數據，或數據均不是正數，無法繪製',
+    map_type: '地圖提供商',
+    map_type_gaode: '高德地圖',
+    map_type_tianditu: '天地圖',
+    map_type_baidu: '百度地圖',
+    map_type_tencent: '騰訊地圖',
+    bullet_chart: '子彈圖',
+    range_bg: '區間背景',
+    legend_name: '圖例名稱',
+    threshold_value: '分界值',
+    range_num: '區間背景個數',
+    show_range_bg: '顯示區間背景',
+    last_item: '最後一項',
+    legend_sort: '圖例排序',
+    quota_position: '指標展示',
+    quota_position_col: '列頭展示',
+    quota_position_row: '行頭展示',
+    quota_col_label: '指標列名',
+    table_grand_total_label: '總計別名',
+    table_field_total_label: '字段別名',
+    table_row_header_freeze: '行頭凍結'
   },
   dataset: {
     field_value: '欄位值',
@@ -1995,7 +2049,7 @@ export default {
     select_year: '選擇年',
     sql_variable_limit_1: '1、SQL 變數只能在WHERE 條件中使用',
     sql_variable_limit_2:
-      "2、範例:select * from table_name where col_name1='${'{'}param_name1{'}'}' and col_name2 in (${'{'}param_name2{'}'})",
+      "2、範例: select * from table where $DE_PARAM{'{'} name = substring('$[PARAM1]',1,5){'}'} and $DE_PARAM{'{'} name in ($[PARAM2]) {'}'}",
     select_month: '選擇月',
     select_date: '選擇日期',
     select_time: '選擇時間',
@@ -2342,9 +2396,11 @@ export default {
     Professional: '專業版',
     Embedded: '嵌入式版',
     support: '取得技術支援',
-    update_success: '更新成功',
+    update_success: '更新成功，請重新登錄',
     serial_no: '序號',
-    remark: '備註'
+    remark: '備註',
+    back_community: '還原至社區版',
+    confirm_tips: '确定還原至社區版？'
   },
   cron: {
     second: '秒',
@@ -2660,7 +2716,8 @@ export default {
       no_children_text: '沒有子節點',
       no_options_text: '沒有可用選項',
       no_results_text: '沒有符合的結果'
-    }
+    },
+    char_count_limit: '不能超過{count}字元'
   },
   sql_variable: {
     variable_mgm: '參數設定'
@@ -2670,7 +2727,7 @@ export default {
     custom_sort: '自訂排序',
     msg_center: '訊息中心',
     to_be_filled: '待填報',
-    the_minimum_value: '數值區間最大值必須大於最小值',
+    the_minimum_value: '數值區間最大值必須大於等於最小值',
     before_querying: '查詢條件是必填項，請設定選項值後，再進行查詢！ ',
     here_or_click: '將右側的字段拖曳到這裡或點擊',
     add_query_condition: '新增查詢條件',
@@ -2767,6 +2824,28 @@ export default {
     column_name: '欄位名稱'
   },
   visualization: {
+    support_query: '僅可新增查詢元件',
+    publish_update_tips: '有更新',
+    filter_freeze_tips: '已存在置頂查詢組件，確定切換該組件？',
+    query_position: '查詢組件位置',
+    default: '預設',
+    to_top: '置頂',
+    publish_recover: '恢復到發佈版本',
+    publish_tips1: '發佈後可查看',
+    publish_tips2: '發佈後可{0}',
+    cancel_publish_tips: '取消發佈成功',
+    resource_not_published: '資源未發佈',
+    re_publish: '重新發佈',
+    published_success: '發佈成功',
+    cancel_publish: '取消發佈',
+    publish: '發佈',
+    freeze_top: '位置凍結在頂部',
+    indicator_linkage: '指標卡聯動僅攜帶圖表過濾參數',
+    gap_size: '間隙大小',
+    small: '小',
+    middle: '中',
+    large: '大',
+    custom: '自定義',
     no_details: '無明細數據',
     sync_pc_design: '同步PC設計',
     title_background: '標題背景',
@@ -2815,6 +2894,7 @@ export default {
       '如果展示查詢按鈕，需要點擊該按鈕後才能觸發圖表查詢；如果不展示查詢按鈕，選擇完查詢條件後立即觸發圖表查詢',
     custom_query_bg_color: '自定義查詢條件背景',
     query_condition_space: '查詢條件間距',
+    query_condition_height: '查詢條件高度',
     query_condition_name: '查詢條件名稱',
     condition_left: '左側',
     condition_top: '上側',
@@ -2898,7 +2978,7 @@ export default {
     dashboard_configuration: '儀表板配置',
     batch_style_set: '批量設置樣式',
     pic_import_tips: '支持JPG、PNG、GIF、SVG，大小不超過 {0}',
-    pic_size_error: '圖片大小不符合',
+    pic_size_error: '圖片大小不能超過15M',
     re_upload: '重新上傳',
     screen_configuration: '儀表板配置',
     mobile_ios_tips: 'IOS可能無法顯示',
@@ -2921,7 +3001,7 @@ export default {
     query: '查詢',
     carousel: '輪播',
     carousel_time: '輪播時間（秒）',
-    carousel_tips: '輪播退出編輯模式才開生效',
+    carousel_tips: '輪播退出編輯模式開始生效',
     carousel_tips2: '啟用條件樣式後，輪播失效',
     background: '背景',
     tab_title: 'Tab標籤',
@@ -2932,12 +3012,14 @@ export default {
     board_width: '線寬',
     board_radius: '圓角',
     enable_event_binding: '開啟事件綁定',
-    event_binding_tips: '事件綁定需退出編輯模式後生效,富文本開啟綁定事件則內部點擊事件失效',
+    event_binding_tips:
+      '事件綁定需退出編輯模式後生效，富文字、指標卡開啟綁定事件則內部點擊事件失效',
     input_url_tips: '請輸入跳轉地址',
     edit_title: '編輯標題',
     custom_sort: '自定義排序',
     show_date: '顯示日期',
     show_time: '顯示時間',
+    show_week: '顯示星期',
     link_info: '鏈接信息',
     pic_upload_tips: '請上傳圖片...',
     pic_group: '圖片組',
@@ -3094,7 +3176,6 @@ export default {
     space_left: '左',
     space_width: '寬',
     space_height: '高',
-    to_top: '置顶',
     down: '下載',
     mobile_style_setting: '樣式設置',
     mobile_style_setting_tips: '自定義移動端背景',
@@ -3130,8 +3211,7 @@ export default {
     template_preview: '預覽模板',
     apply: '應用',
     apply_this_template: '應用此模板',
-    market_network_tips:
+    market_network_tips: '查看模板市場模板需要服務器與模板市場({0})連通，請檢查網絡...',
-      '查看模板市場模板需要服務器與模板市場(https://templates.dataease.cn)連通，請檢查網絡...',
     enter_name_tips: '請輸入儀表板名稱',
     apply_template: '應用模板',
     style_template: '樣式模板',
@@ -3261,7 +3341,6 @@ export default {
     template: '模板',
     category: '分類',
     all_org: '所有組織',
-    custom: '自定義',
     import_template: '匯入模板',
     copy_template: '復用模板',
     upload_template: '上傳模板',
@@ -3526,7 +3605,14 @@ export default {
     refresh: '刷新',
     time_tips: '單位: 分鐘，範圍: [0-1440],0代表無期限，自首次使用ticket訪問開始',
     arg_val_tips: '請輸入參數值',
-    arg_format_tips: '請使用JSON格式字符串，示例單值argVal，多值[argVal1, argVal2]'
+    arg_format_tips: '請使用JSON數組格式，示例單值[argVal]，多值[argVal1, argVal2]',
+    param_error: 'Ticket 參數錯誤！',
+    exp_error: 'Ticket 已過期！',
+    disable_error: '已禁用分享功能，請聯系管理員！',
+    pe_require_error: '已設置有效期密碼必填，當前鏈接無效！',
+    iframe_error: '僅嵌入式版和企業版支持iframe方式內嵌公共鏈接！',
+    link_error: '鏈接不存在！',
+    link_exp_error: '鏈接已過期！'
   },
   pblink: {
     key_pwd: '請輸入密碼開啟連結',
@@ -3649,7 +3735,7 @@ export default {
     data_source_table: '資料來源表',
     auth_method: '認證方式',
     passwd: '使用者名稱密碼',
-    kerbers_info: '請確保krb5.Conf、Keytab Key，已新增至路徑：/opt/gisbi/conf',
+    kerbers_info: '請確保krb5.Conf、Keytab Key，已新增至路徑：/opt/dataease2.0/conf',
     client_principal: 'Client Principal',
     keytab_Key_path: 'Keytab Key Path',
     data_base: '資料庫名稱',
@@ -4012,6 +4098,8 @@ export default {
     save_apply: '儲存並套用'
   },
   data_fill: {
+    commit_operate_type: '提交類型',
+    committer: '提交人',
     data_fill: '資料填報',
     fill_in_the_task: '填報任務',
     data_fill_name: '資料填報名稱',
@@ -4023,11 +4111,13 @@ export default {
     new_folder: '新建資料夾',
     form_manage: '表單管理',
     my_job: '我的填報',
+    short_name: '填報',
     disable_data_fill_hint: '關閉資料填報後，表單資料將提交失敗，確定關閉？ ',
     enable_data_fill_hint: '啟用後，允許在資料來源資料庫中新建資料表，並將表單資料存放至表中',
     todo: '待填報',
     finished: '已填報',
     expired: '已過期',
+    all: '全部',
     required_select: '必選',
     condition: '過濾值',
     add_condition: '新增條件',
@@ -4195,6 +4285,8 @@ export default {
       download: '下載',
       download_template: '下載模板',
       insert_data: '插入資料',
+      batch_insert_data: '批量導入',
+      batch_insert_data_with_count: '批量導入，共{0}條數據',
       update_data: '更新資料',
       delete_data: '刪除資料',
       recent_committer: '最近提交人',

core/core-frontend/src/locales/zh-CN.ts

@@ -1,9 +1,20 @@
 export default {
   common: {
+    empty: '',
+    cross_source: '跨源',
+    single_source: '单源',
+    source_tips: '数据集存在跨源情况，请检查其他 SQL 节点的语法，是否确认将类型改为单源?',
+    other_levels: '除层级一外,其他层级无需进行查询条件配置',
+    tree_structure: '下拉树的结构不能为空',
+    associated_chart: '关联图表',
+    associated_chart_first: '第一层级已关联图表',
     timeout_tips: '请求超时，请稍后再试',
+    local_excel: '本地 Excel/CSV',
+    remote_excel: '远程 Excel/CSV',
     watermarkManagement: '水印管理',
     list_selection: '列表选择',
     date_setting: '日期设置',
+    changing_the_display: '更改展示类型将会清除下拉树相关设置,是否确定?',
     component: {
       input: '单行输入',
       textarea: '多行输入',
@@ -100,7 +111,7 @@ export default {
   },
   operate_log: {
     name: '操作日志',
-    search_by_operate_info: '通过操作详情搜索',
+    search_by_operate_info: '通过操作对象搜索',
     detail: '操作详情',
     type: '操作类型',
     status: '操作状态',
@@ -168,7 +179,7 @@ export default {
     all: '全部',
     successful_go_to: '导出成功，前往',
     failed_go_to: '导出失败，前往',
-    data_set: '数据集1',
+    data_set: '数据集',
     view: '图表',
     organization: '所属组织',
     download: '下载',
@@ -360,6 +371,7 @@ export default {
     lweek: '上周',
     cmonth: '本月',
     cquarter: '本季',
+    tquarter: '本季度',
     lquarter: '上季',
     cyear: '本年'
   },
@@ -686,7 +698,8 @@ export default {
     upload_a_cover: '请上传封面',
     edit_theme: '编辑主题',
     cover: '封面',
-    to_delete_: '确定删除[{0}]吗?'
+    to_delete_: '确定删除[{0}]吗?',
+    to_delete_variable: '确定删除 {0} 吗?'
   },
   user: {
     change_password: '修改密码',
@@ -858,7 +871,7 @@ export default {
     menu: '菜单权限',
     panel: '仪表板',
     screen: '数据大屏',
-    dataset: '数据集2',
+    dataset: '数据集',
     datasource: '数据源',
     all_types: '全部类型',
     empty_desc: '请选择用户/角色以及资源类型',
@@ -1047,6 +1060,7 @@ export default {
     primary_key_change: '主键不能改变:',
     primary_key_length: '主键必须设置长度: ',
     api_field_not_empty: '字段不能为空',
+    file_not_empty: '文件不能为空',
     success_copy: '复制成功',
     valid: '有效',
     invalid: '无效',
@@ -1109,7 +1123,12 @@ export default {
     table_id: 'table_id',
     input_table_id: '请选择数据表',
     view_id: 'view_id',
-    input_view_id: '请选择视图'
+    input_view_id: '请选择视图',
+    remote_excel_url: '远程 Excel/CSV 地址',
+    remote_excel_url_placeholder:
+      '请输入远程 Excel/CSV 地址，例如 ftp://192.168.1.101/files/data.xlsx',
+    remote_excel_url_empty: '请输入远程 Excel/CSV 地址',
+    load_data: '加载数据'
   },
   chart: {
     align: '对齐方式',
@@ -1334,6 +1353,7 @@ export default {
     table_title_fontsize: '表头字体大小',
     table_item_fontsize: '表格字体大小',
     table_header_bg: '表头背景',
+    table_header_row_bg: '表头/行背景',
     table_item_bg: '表格背景',
     table_header_font_color: '表头字体',
     table_item_font_color: '表格字体',
@@ -1343,6 +1363,7 @@ export default {
     table_show_col_tooltip: '开启列头提示',
     table_show_cell_tooltip: '开启单元格提示',
     table_show_header_tooltip: '开启表头提示',
+    table_summary: '总计',
     table_show_summary: '显示总计',
     table_summary_label: '总计标签',
     table_header_show_horizon_border: '表头横边框线',
@@ -1402,7 +1423,12 @@ export default {
     y_W: '年周',
     y_M_d: '年月日',
     M_d: '月日',
+    M: '月',
+    d: '日',
+    H: '时',
+    H_m: '时分',
     H_m_s: '时分秒',
+    y_M_d_H: '年月日时',
     y_M_d_H_m: '年月日时分',
     y_M_d_H_m_s: '年月日时分秒',
     date_sub: 'yyyy-MM-dd',
@@ -1680,6 +1706,9 @@ export default {
     value_formatter_value: '数值',
     value_formatter_percent: '百分比',
     value_formatter_unit: '数量单位',
+    value_formatter_unit_language: '单位语言',
+    value_formatter_unit_language_ch: '中文',
+    value_formatter_unit_language_en: '英文',
     value_formatter_decimal_count: '小数位数',
     value_formatter_suffix: '单位后缀',
     show_gap: '显示间隔值',
@@ -1869,6 +1898,7 @@ export default {
     radiusColumnBar: '柱形',
     rightAngle: '直角',
     roundAngle: '圆角',
+    topRoundAngle: '顶部圆角',
     table_layout_mode: '展示形式',
     table_layout_grid: '平铺展示',
     table_layout_tree: '树形展示',
@@ -1910,7 +1940,7 @@ export default {
     radar_point_size: '辅助点大小',
     radar_area_color: '开启面积',
     table_freeze_tip: '合并单元格后，不支持行列冻结',
-    merge_cells_tips: '合并单元格后，行列冻结、自动换行、班马纹会失效',
+    merge_cells_tips: '合并单元格后，行列冻结、自动换行和斑马纹会失效，当前页的序号会从 1 开始',
     merge_cells_break_line_tip: '合并单元格后，不支持自动换行',
     font_family_ya_hei: '微软雅黑',
     font_family_song_ti: '宋体',
@@ -1983,9 +2013,33 @@ export default {
     decrease: '减少',
     waterfall_total: '合计',
     accumulate: '累加',
-    table_cross_bg_tip: '合并单元格后，不支持班马纹',
+    table_cross_bg_tip: '合并单元格后，不支斑马纹',
     pivot_export_invalid_field: '行维度或指标维度为空不可导出!',
-    pivot_export_invalid_col_exceed: '表格列数超过最大限制不可导出!'
+    pivot_export_invalid_col_exceed: '表格列数超过最大限制不可导出!',
+    expand_all: '全展开',
+    level_label: '第{num}层级',
+    default_expand_level: '默认展开层级',
+    no_data_or_not_positive: '暂无数据，或数据均不是正数，无法绘制',
+    map_type: '地图提供商',
+    map_type_gaode: '高德地图',
+    map_type_tianditu: '天地图',
+    map_type_baidu: '百度地图',
+    map_type_tencent: '腾讯地图',
+    bullet_chart: '子弹图',
+    range_bg: '区间背景',
+    legend_name: '图例名称',
+    threshold_value: '分界值',
+    range_num: '区间背景个数',
+    show_range_bg: '显示区间背景',
+    last_item: '最后一项',
+    legend_sort: '图例排序',
+    quota_position: '指标展示',
+    quota_position_col: '列头展示',
+    quota_position_row: '行头展示',
+    quota_col_label: '指标列名',
+    table_grand_total_label: '总计别名',
+    table_field_total_label: '字段别名',
+    table_row_header_freeze: '行头冻结'
   },
   dataset: {
     field_value: '字段值',
@@ -2001,7 +2055,7 @@ export default {
     select_year: '选择年',
     sql_variable_limit_1: '1、SQL 变量只能在 WHERE 条件中使用',
     sql_variable_limit_2:
-      "2、示例:select * from table_name where col_name1='${'{'}param_name1{'}'}' and col_name2 in (${'{'}param_name2{'}'})",
+      "2、示例: select * from table where $DE_PARAM{'{'} name = substring('$[PARAM1]',1,5){'}'} and $DE_PARAM{'{'} name in ($[PARAM2]) {'}'}",
     select_month: '选择月',
     select_date: '选择日期',
     select_time: '选择时间',
@@ -2011,7 +2065,7 @@ export default {
     time_all: '日期-年月日时分秒',
     dataset_sync: ' ( 数据同步中... )',
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
-    datalist: '数据集3',
+    datalist: '数据集',
     name: '数据集名称',
     add_group: '添加分组',
     add_scene: '添加场景',
@@ -2150,7 +2204,7 @@ export default {
       next_exec_time: '下次执行时间',
       last_exec_status: '上次执行结果',
       task_status: '任务状态',
-      dataset: '数据集4',
+      dataset: '数据集',
       search_by_name: '根据名称搜索',
       underway: '等待执行',
       stopped: '执行结束',
@@ -2348,9 +2402,11 @@ export default {
     Professional: '专业版',
     Embedded: '嵌入式版',
     support: '获取技术支持',
-    update_success: '更新成功',
+    update_success: '更新成功，请重新登录',
     serial_no: '序列号',
-    remark: '备注'
+    remark: '备注',
+    back_community: '还原至社区版',
+    confirm_tips: '确定还原至社区版？'
   },
   cron: {
     second: '秒',
@@ -2666,7 +2722,8 @@ export default {
       no_children_text: '没有子节点',
       no_options_text: '没有可用选项',
       no_results_text: '没有匹配的结果'
-    }
+    },
+    char_count_limit: '不能超过{count}字符'
   },
   sql_variable: {
     variable_mgm: '参数设置'
@@ -2676,7 +2733,7 @@ export default {
     custom_sort: '自定义排序',
     msg_center: '消息中心',
     to_be_filled: '待填报',
-    the_minimum_value: '数值区间最大值必须大于最小值',
+    the_minimum_value: '数值区间最大值必须大于等于最小值',
     before_querying: '查询条件是必填项，请设置选项值后，再进行查询！',
     here_or_click: '将右侧的字段拖拽到这里 或 点击',
     add_query_condition: '添加查询条件',
@@ -2773,6 +2830,28 @@ export default {
     column_name: '字段名称'
   },
   visualization: {
+    support_query: '仅支持添加查询组件',
+    publish_update_tips: '有更新',
+    filter_freeze_tips: '已存在置顶查询组件,确定切换该组件？',
+    query_position: '查询组件位置',
+    default: '默认',
+    to_top: '置顶',
+    publish_recover: '恢复到发布版本',
+    publish_tips1: '发布后可查看',
+    publish_tips2: '发布后可{0}',
+    cancel_publish_tips: '取消发布成功',
+    resource_not_published: '资源未发布',
+    re_publish: '重新发布',
+    published_success: '发布成功',
+    cancel_publish: '取消发布',
+    publish: '发布',
+    freeze_top: '位置冻结在顶部',
+    indicator_linkage: '指标卡联动仅携带图表过滤参数',
+    gap_size: '间隙大小',
+    small: '小',
+    middle: '中',
+    large: '大',
+    custom: '自定义',
     no_details: '无明细数据',
     sync_pc_design: '同步PC设计',
     title_background: '标题背景',
@@ -2822,6 +2901,7 @@ export default {
       '如果展示查询按钮，需要点击该按钮后才能触发图表查询；如果不展示查询按钮，选择完查询条件后立即触发图表查询',
     custom_query_bg_color: '自定义查询条件背景',
     query_condition_space: '查询条件间距',
+    query_condition_height: '查询条件高度',
     query_condition_name: '查询条件名称',
     condition_left: '左侧',
     condition_top: '上侧',
@@ -2879,7 +2959,7 @@ export default {
     cancel: '取消',
     select_ds_group_folder: '请选择数据集分组所属文件夹',
     app_no_datasource_tips: '存在未配置的数据源',
-    dataset: '数据集5',
+    dataset: '数据集',
     delete: '删除',
     delete_success: '删除成功',
     save_success: '保存成功',
@@ -2905,7 +2985,7 @@ export default {
     dashboard_configuration: '仪表板配置',
     batch_style_set: '批量设置样式',
     pic_import_tips: '支持JPG、PNG、GIF、SVG，大小不超过 {0}',
-    pic_size_error: '图片大小不符合',
+    pic_size_error: '图片大小不能超过15M',
     re_upload: '重新上传',
     screen_configuration: '仪表板配置',
     mobile_ios_tips: 'IOS可能无法显示',
@@ -2928,7 +3008,7 @@ export default {
     query: '查询',
     carousel: '轮播',
     carousel_time: '轮播时间（秒）',
-    carousel_tips: '轮播退出编辑模式才开生效',
+    carousel_tips: '轮播退出编辑模式开始生效',
     carousel_tips2: '启用条件样式后，轮播失效',
     background: '背景',
     tab_title: 'Tab标签',
@@ -2945,6 +3025,7 @@ export default {
     custom_sort: '自定义排序',
     show_date: '显示日期',
     show_time: '显示时间',
+    show_week: '显示星期',
     link_info: '链接信息',
     pic_upload_tips: '请上传图片...',
     pic_group: '图片组',
@@ -3100,7 +3181,6 @@ export default {
     space_left: '左',
     space_width: '宽',
     space_height: '高',
-    to_top: '置顶',
     down: '下载',
     mobile_style_setting: '样式设置',
     mobile_style_setting_tips: '自定义移动端背景',
@@ -3136,8 +3216,7 @@ export default {
     template_preview: '预览模板',
     apply: '应用',
     apply_this_template: '应用此模板',
-    market_network_tips:
+    market_network_tips: `查看模板市场模板需要服务器与模板市场({0})连通，请检查网络...`,
-      '查看模板市场模板需要服务器与模板市场(https://templates.dataease.cn)连通，请检查网络...',
     enter_name_tips: '请输入仪表板名称',
     apply_template: '应用模板',
     style_template: '样式模板',
@@ -3268,7 +3347,6 @@ export default {
     template: '模板',
     category: '分类',
     all_org: '所有组织',
-    custom: '自定义',
     import_template: '导入模板',
     copy_template: '复用模板',
     upload_template: '上传模板',
@@ -3496,7 +3574,7 @@ export default {
     big_data_screen: '数据大屏',
     big_screen: '大屏',
     dashboard: '仪表板',
-    data_set: '数据集6',
+    data_set: '数据集',
     data_source: '数据源',
     recently_used: '最近使用',
     my_collection: '我的收藏',
@@ -3533,7 +3611,14 @@ export default {
     refresh: '刷新',
     time_tips: '单位: 分钟，范围: [0-1440],0代表无期限，自首次使用ticket访问开始',
     arg_val_tips: '请输入参数值',
-    arg_format_tips: '请使用JSON格式字符串，示例单值argVal，多值[argVal1, argVal2]'
+    arg_format_tips: '请使用JSON数组格式，示例单值[argVal]，多值[argVal1, argVal2]',
+    param_error: 'Ticket 参数错误！',
+    exp_error: 'Ticket 已过期！',
+    disable_error: '已禁用分享功能，请联系管理员！',
+    pe_require_error: '已设置有效期密码必填，当前链接无效！',
+    iframe_error: '仅嵌入式版和企业版支持iframe方式内嵌公共链接！',
+    link_error: '链接不存在！',
+    link_exp_error: '链接已过期！'
   },
   pblink: {
     key_pwd: '请输入密码打开链接',
@@ -4028,11 +4113,13 @@ export default {
     new_folder: '新建文件夹',
     form_manage: '表单管理',
     my_job: '我的填报',
+    short_name: '填报',
     disable_data_fill_hint: '关闭数据填报后，表单数据将提交失败，确定关闭？',
     enable_data_fill_hint: '启用后，允许在数据源数据库中新建表，并将表单数据存放至表中',
     todo: '待填报',
     finished: '已填报',
     expired: '已过期',
+    all: '全部',
     required_select: '必选',
     condition: '过滤值',
     add_condition: '添加条件',
@@ -4199,6 +4286,8 @@ export default {
       download: '下载',
       download_template: '下载模板',
       insert_data: '插入数据',
+      batch_insert_data: '批量导入',
+      batch_insert_data_with_count: '批量导入，共{0}条数据',
       update_data: '更新数据',
       delete_data: '删除数据',
       recent_committer: '最近提交人',
@@ -4209,6 +4298,8 @@ export default {
       data_not_found: ']的数据不存在'
     },
     task: {
+      commit_operate_type: '提交类型',
+      committer: '提交人',
       send_status: '任务下发状态',
       df_task_status: '任务填报状态',
       time_check_5_minute_later_than_current: '不能小于当前时间5分钟后',
@@ -4347,7 +4438,7 @@ export default {
   relation: {
     no_permission: '没有查看权限',
     datasource: '数据源',
-    dataset: '数据集7',
+    dataset: '数据集',
     dashboard: '仪表板',
     dataV: '数据大屏',
     analysis: '血缘分析',