Merge branch 'dev' into pr@dev@feat_line_hide_empty_data

# Conflicts: # frontend/src/lang/en.js # frontend/src/lang/tw.js # frontend/src/lang/zh.js
2026-05-22 21:38:32 +08:00 · 2022-11-18 15:47:37 +08:00
parent d32043ef8b cf47495ba2
commit 50938eb702
106 changed files with 6749 additions and 995 deletions
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -813,7 +813,7 @@ export default {
    front_time_out: 'Request timeOut(unit: second, Attention: Refresh browser takes effect after saving)',
    msg_time_out: 'Message retention time(unit: day)',
    login_type: 'Default login type',
-    empty_front: 'If empty then default value is 10s',
+    empty_front: 'If empty then default value is 100s',
    empty_msg: 'If empty then default value is 30 days',
    front_error: 'Valid range [0 - 300]', // 修改了提示信息
    msg_error: 'Valid range [1 - 365]',
@@ -1442,6 +1442,11 @@ export default {
    label_content: 'Label Content',
    percent: 'Percent',
    table_index_desc: 'Index Header Name',
+    total_sort: 'Total Sort',
+    total_sort_none: 'None',
+    total_sort_asc: 'ASC',
+    total_sort_desc: 'DESC',
+    total_sort_field: 'Sort Field',
    empty_data_strategy: 'Empty Data Strategy',
    break_line: 'Disconnection',
    set_zero: 'Set Zero',
@@ -1455,7 +1460,7 @@ export default {
    field_rename: 'Rename Field',
    params_work: 'Effective only when editing SQL',
    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 column_name1='${param_name1}' and column_name2 in '${param_name2}'",
+    sql_variable_limit_2: '2、Example：select * from table_name where column_name1=\'${param_name1}\' and column_name2 in \'${param_name2}\'',
    select_year: 'Select Year',
    select_month: 'Select Month',
    select_date: 'Select Date',
@@ -1866,13 +1871,35 @@ export default {
    input_placeholder: 'Please enter the 4-digits-letters',
    pwd_error: 'Wrong password',
    pwd_format_error: 'Please enter the 4-digits-letters',
-    sure_bt: 'Confirm'
+    sure_bt: 'Confirm',
+    back_parent: 'Back to previous'
  },
  panel: {
+
+    down: 'Down',
+
+    mobile_style_setting: 'Style setting',
+    mobile_style_setting_tips: 'Customize the mobile background',
+
+    board: 'Border',
+    text: 'Text',
+    board_background: 'Background',
+    title_color: 'Title color',
+    input_style: 'Input box style (color)',
+    overall_setting: 'Overall setting',
+    panel_background: 'Panel background',
+    component_color: 'Component color',
+    chart_title: 'Chart title',
+    filter_component: 'Filter component',
+    enable_refresh_view: 'Enable refresh',
+    enable_view_loading: 'View loading prompt',
+    image_size_tips: 'Please do not exceed 15M in the picture',
+    image_add_tips: 'Only pictures can be inserted',
+    watermark: 'Watermark',
    panel_get_data_error: 'Failed to obtain panel information. The panel may have been deleted. Please check the panel status',
    panel_no_save_tips: 'There are unsaved panel',
    panel_cache_use_tips: 'It was checked that the last dashboard could not be saved normally. Do you want to use the panel that was not saved last time?',
-    template_name_tips: "Panel\'s name should not be null",
+    template_name_tips: 'Panel\'s name should not be null',
    panel_background_item: 'Customize panel background',
    panel_background_image_tips: 'Currently.Jpeg,.Jpg,.Png,.Gif files are supported, and the size should not exceed 15m',
    reUpload: 'reUpload',
@@ -1938,15 +1965,15 @@ export default {
    repeat_params: 'Repeat Params Exist',
    enable_outer_param_set: 'Enable Outer Param Set',
    select_param: 'Please Select Param...',
-    add_param_link_field: "Add Params' Linked Field",
+    add_param_link_field: 'Add Params\' Linked Field',
    add_param: 'Add Param',
    enable_param: 'Enable Param',
    param_name: 'Param Name',
    outer_param_set: 'Outer Param Set',
    outer_param_decode_error: 'External Parameter Parsing Error And Does Not Take Effect, Please Check',
-    input_param_name: "Please Input Param's Name",
+    input_param_name: 'Please Input Param\'s Name',
    params_setting: 'Outer Params Setting',
-    template_view_tips: "Template's Views. Please Change",
+    template_view_tips: 'Template\'s Views. Please Change',
    edit_web_tips: 'The Inner Event Can Be Used When Then Panel Not In Edit Status',
    no_auth_role: 'Unshared roles',
    auth_role: 'Shared roles',
@@ -2102,8 +2129,8 @@ export default {
    content_style: 'Content Style',
    canvas_self_adaption: 'Canvas Self Adaption',
    panel_save_tips: 'Do you want to save the changes you made to.',
-    panel_save_warn_tips: "Your changes will be lost if you don't save them！",
-    do_not_save: "Don't Save",
+    panel_save_warn_tips: 'Your changes will be lost if you don\'t save them！',
+    do_not_save: 'Don\'t Save',
    save_and_close: 'Save',
    drill: 'drill',
    linkage: 'linkage',
@@ -2524,7 +2551,9 @@ export default {
    pixel_tip: 'Please code custom pixel(such as 2560 * 1600) or select',
    task_type: 'Task type',
    range_view: 'Displayed data',
-    range_all: 'All data'
+    range_all: 'All data',
+    execute_now: 'Execute now',
+    fire_now_success: 'Task executing'
  },
  dynamic_time: {
    set_default: 'Set Default',
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -813,7 +813,7 @@ export default {
    front_time_out: '請求超時時間(單位:秒, 註意:保存後刷新瀏覽器生效)',
    msg_time_out: '消息保留時間(單位:天)',
    login_type: '默認登錄方式',
-    empty_front: '為空則默認取值10秒',
+    empty_front: '為空則默認取值100秒',
    empty_msg: '為空則默認取值30天',
    front_error: '請填寫0-300正整數', // 修改了提示信息
    msg_error: '請填寫1-365正整數',
@@ -1442,6 +1442,11 @@ export default {
    label_content: '標籤展示',
    percent: '占比',
    table_index_desc: '表頭名稱',
+    total_sort: '總計排序',
+    total_sort_none: '無',
+    total_sort_asc: '升序',
+    total_sort_desc: '降序',
+    total_sort_field: '排序字段',
    empty_data_strategy: '空值處理',
    break_line: '線條斷開',
    set_zero: '置為0，線條不斷開',
@@ -1455,7 +1460,7 @@ export default {
    field_rename: '字段重命名',
    params_work: '僅在編輯 sql 時生效',
    sql_variable_limit_1: '1、SQL變數只能在WHERE條件中使用',
-    sql_variable_limit_2: "2、示例：select * from table_name where column_name1='${param_name1}' and column_name2 in '${param_name2}'",
+    sql_variable_limit_2: '2、示例：select * from table_name where column_name1=\'${param_name1}\' and column_name2 in \'${param_name2}\'',
    selesql_variable_limit_2ct_year: '選擇年',
    select_month: '選擇月',
    select_date: '選擇日期',
@@ -1866,9 +1871,31 @@ export default {
    input_placeholder: '請輸入4位數字或字母',
    pwd_error: '密碼錯誤',
    pwd_format_error: '請輸入4位數字或字母',
-    sure_bt: '確定'
+    sure_bt: '確定',
+    back_parent: '返回上一級'
  },
  panel: {
+
+    down: '下載',
+
+    mobile_style_setting: '樣式設置',
+    mobile_style_setting_tips: '自定義移動端背景',
+
+    board: '邊框',
+    text: '文字',
+    board_background: '背景',
+    title_color: '標題顏色',
+    input_style: '輸入框樣式(顏色)',
+    overall_setting: '整體配置',
+    panel_background: '儀表板背景',
+    component_color: '組件配色',
+    chart_title: '圖表標題',
+    filter_component: '過濾組件',
+    enable_refresh_view: '開啟刷新',
+    enable_view_loading: '視圖加載提示',
+    image_size_tips: '圖片請不要大於15M',
+    image_add_tips: '只能插入圖片',
+    watermark: '水印',
    panel_get_data_error: '獲取儀表板信息失敗，儀表板可能已經被刪除，請檢查儀表板狀態',
    panel_no_save_tips: '存在未保存的儀表板',
    panel_cache_use_tips: '檢查到上次有儀表板未能正常保存，是否使用上次未保存的儀表板？',
@@ -2525,7 +2552,9 @@ export default {
    pixel_tip: '可直接輸入分辨率(例如:2560 * 1600)或者選擇',
    task_type: '任務類型',
    range_view: '展示數據',
-    range_all: '全部數據'
+    range_all: '全部數據',
+    execute_now: '立即執行',
+    fire_now_success: '任務發起成功'
  },
  dynamic_time: {
    set_default: '設置默認值',
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -812,7 +812,7 @@ export default {
    front_time_out: '请求超时时间(单位:秒, 注意:保存后刷新浏览器生效)',
    msg_time_out: '消息保留时间(单位:天)',
    login_type: '默认登录方式',
-    empty_front: '为空则默认取10秒',
+    empty_front: '为空则默认取100秒',
    empty_msg: '为空则默认取30天',
    front_error: '请填写0-300正整数', // 修改了提示信息
    msg_error: '请填写1-365正整数',
@@ -1441,6 +1441,11 @@ export default {
    label_content: '标签展示',
    percent: '占比',
    table_index_desc: '表头名称',
+    total_sort: '总计排序',
+    total_sort_none: '无',
+    total_sort_asc: '升序',
+    total_sort_desc: '降序',
+    total_sort_field: '排序字段',
    empty_data_strategy: '空值处理',
    break_line: '线条断开',
    set_zero: '置为0,线条不断开',
@@ -1455,7 +1460,7 @@ export default {
    params_work: '仅在编辑sql时生效',
    select_year: '选择年',
    sql_variable_limit_1: '1、SQL 变量只能在 WHERE 条件中使用',
-    sql_variable_limit_2: "2、示例：select * from table_name where column_name1='${param_name1}' and column_name2 in '${param_name2}'",
+    sql_variable_limit_2: '2、示例：select * from table_name where column_name1=\'${param_name1}\' and column_name2 in \'${param_name2}\'',
    select_month: '选择月',
    select_date: '选择日期',
    select_time: '选择时间',
@@ -1866,9 +1871,31 @@ export default {
    input_placeholder: '请输入4位数字或字母',
    pwd_error: '密码错误',
    pwd_format_error: '请输入4位数字或字母',
-    sure_bt: '确定'
+    sure_bt: '确定',
+    back_parent: '返回上一级'
  },
  panel: {
+
+    down: '下载',
+
+    mobile_style_setting: '样式设置',
+    mobile_style_setting_tips: '自定义移动端背景',
+
+    board: '边框',
+    text: '文字',
+    board_background: '背景',
+    title_color: '标题颜色',
+    input_style: '输入框样式(颜色)',
+    overall_setting: '整体配置',
+    panel_background: '仪表板背景',
+    component_color: '组件配色',
+    chart_title: '图表标题',
+    filter_component: '过滤组件',
+    enable_refresh_view: '开启刷新',
+    enable_view_loading: '视图加载提示',
+    image_size_tips: '图片请不要大于15M',
+    image_add_tips: '只能插入图片',
+    watermark: '水印',
    panel_get_data_error: '获取仪表板信息失败，仪表板可能已经被删除，请检查仪表板状态',
    panel_no_save_tips: '存在未保存的仪表板',
    panel_cache_use_tips: '检查到上次有仪表板未能正常保存，是否使用上次未保存的仪表板？',
@@ -2525,7 +2552,9 @@ export default {
    pixel_tip: '可直接输入自定义分辨率(例如:2560 * 1600)或选择',
    task_type: '任务类型',
    range_view: '展示数据',
-    range_all: '全部数据'
+    range_all: '全部数据',
+    execute_now: '立即执行',
+    fire_now_success: '任务发起成功'
  },
  dynamic_time: {
    set_default: '设置默认值',