From 87d7b56a8eee1453cbd912f82378a892dc5293bf Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 26 Sep 2022 17:47:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E6=95=B4=E7=90=86=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 5 +- frontend/src/lang/tw.js | 5 +- frontend/src/lang/zh.js | 5 +- .../src/views/system/datasource/DsMain.vue | 106 +++++++++--------- 4 files changed, 57 insertions(+), 64 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index e4e2de2c44..18082321dc 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -498,7 +498,6 @@ export default { folder_name: 'Folder Name', folder: 'Folder', edit_folder: 'Edit Folder', - new_folder: 'New Folder', name_already_exists: 'Folder name already exists', data_preview: 'Data preview', original_name: 'Original Name', @@ -512,8 +511,6 @@ export default { expression_syntax_error: 'Field expression syntax error', create_dashboard: 'Create Dashboard', cannot_be_empty: 'SQL cannot be empty', - to_run_query: 'Click to run query', - the_running_results: 'You can view the running results', data_reference: 'Data Reference', want_to_replace: 'Replacement may affect custom dataset, associated dataset, dashboard, etc. Do you want to replace?', replace_the_data: 'Are you sure to replace the data?', @@ -1793,7 +1790,7 @@ export default { driver_name: 'Driver name:', drive_type: 'Drive type', add_driver: 'Add driver', - on_the_left: 'Please select drive on the left', + diver_on_the_left: 'Please select drive on the left', no_data_table: 'No data table', on_the_left: 'Please select the data source on the left', table_name: 'Table name:', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 31e848ab5f..b871da38cf 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -498,7 +498,6 @@ export default { folder_name: '資料夾名稱', folder: '所屬資料夾', edit_folder: '編輯資料夾', - new_folder: '新建資料夾', name_already_exists: '資料夾名稱已存在', data_preview: '數據預覽', original_name: '原始名稱', @@ -512,8 +511,6 @@ export default { expression_syntax_error: '欄位運算式語法錯誤', create_dashboard: '創建儀表板', cannot_be_empty: 'SQL不能為空', - to_run_query: '點擊運行査詢', - the_running_results: '即可查看運行結果', data_reference: '數據參攷', want_to_replace: '替換可能會影響自定義數据集、關聯數据集、儀表板等，是否替換？', replace_the_data: '確定替換數據嗎？', @@ -1793,7 +1790,7 @@ export default { driver_name: '驅動名稱', drive_type: '驅動類型', add_driver: '添加驅動', - on_the_left: '請在左側選擇驅動', + diver_on_the_left: '請在左側選擇驅動', no_data_table: '暫無資料表', on_the_left: '請在左側選擇資料來源', table_name: '表名稱', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 09ed5853c8..d5a9346ca2 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -497,7 +497,6 @@ export default { folder_name: '文件夹名称', folder: '所属文件夹', edit_folder: '编辑文件夹', - new_folder: '新建文件夹', name_already_exists: '文件夹名称已存在', data_preview: '数据预览', original_name: '原始名称', @@ -511,8 +510,6 @@ export default { expression_syntax_error: '字段表达式语法错误', create_dashboard: '创建仪表板', cannot_be_empty: 'SQL不能为空', - to_run_query: '点击运行查询', - the_running_results: '即可查看运行结果', data_reference: '数据参考', want_to_replace: '替换可能会影响自定义数据集、关联数据集、仪表板等，是否替换？', replace_the_data: '确定替换数据吗？', @@ -1792,7 +1789,7 @@ export default { driver_name: '驱动名称', drive_type: '驱动类型', add_driver: '添加驱动', - on_the_left: '请在左侧选择驱动', + diver_on_the_left: '请在左侧选择驱动', no_data_table: '暂无数据表', on_the_left: '请在左侧选择数据源', table_name: '表名称', diff --git a/frontend/src/views/system/datasource/DsMain.vue b/frontend/src/views/system/datasource/DsMain.vue index 0e8d885d3a..86689e056c 100644 --- a/frontend/src/views/system/datasource/DsMain.vue +++ b/frontend/src/views/system/datasource/DsMain.vue @@ -1,16 +1,19 @@ \ No newline at end of file + From 3b2969468479cefc46705b5b62e1f2f64b3e82b9 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 26 Sep 2022 17:47:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20TIME=20?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=8B=BC=E6=8E=A5=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/provider/query/mysql/MysqlQueryProvider.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java index b96fc039f1..1b3115b6f5 100644 --- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java @@ -116,6 +116,8 @@ public class MysqlQueryProvider extends QueryProvider { } else { if(f.getType().equalsIgnoreCase("YEAR")){ fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originField + ",'-01-01')", MySQLConstants.DEFAULT_DATE_FORMAT); + }else if(f.getType().equalsIgnoreCase("TIME")){ + fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(1970-01-01 " + originField + ")", MySQLConstants.DEFAULT_DATE_FORMAT); }else { fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, MySQLConstants.DEFAULT_DATE_FORMAT); } @@ -173,6 +175,8 @@ public class MysqlQueryProvider extends QueryProvider { } else { if(f.getType().equalsIgnoreCase("YEAR")){ fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originField + ",'-01-01')", MySQLConstants.DEFAULT_DATE_FORMAT); + }else if(f.getType().equalsIgnoreCase("TIME")){ + fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(1970-01-01 " + originField + ")", MySQLConstants.DEFAULT_DATE_FORMAT); }else { fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, MySQLConstants.DEFAULT_DATE_FORMAT); } @@ -1135,6 +1139,8 @@ public class MysqlQueryProvider extends QueryProvider { } else if (x.getDeType() == 1) { if(x.getType().equalsIgnoreCase("YEAR")){ fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originField + ",'-01-01')", transDateFormat(x.getDateStyle(), x.getDatePattern())); + }else if(x.getType().equalsIgnoreCase("TIME")){ + fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(1970-01-01 " + originField + ")", MySQLConstants.DEFAULT_DATE_FORMAT); }else { String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, format); From a900d71849d4df910e1ef44169eef0871e575145 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 27 Sep 2022 10:17:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../query/mysql/MysqlQueryProvider.java | 18 +++++++++--------- frontend/src/lang/en.js | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java index 1b3115b6f5..5f16332cd1 100644 --- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java @@ -114,11 +114,11 @@ public class MysqlQueryProvider extends QueryProvider { if (f.getDeType() == 2 || f.getDeType() == 3) { fieldName = String.format(MySQLConstants.UNIX_TIMESTAMP, originField) + "*1000"; } else { - if(f.getType().equalsIgnoreCase("YEAR")){ + if (f.getType().equalsIgnoreCase("YEAR")) { fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originField + ",'-01-01')", MySQLConstants.DEFAULT_DATE_FORMAT); - }else if(f.getType().equalsIgnoreCase("TIME")){ + } else if (f.getType().equalsIgnoreCase("TIME")) { fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(1970-01-01 " + originField + ")", MySQLConstants.DEFAULT_DATE_FORMAT); - }else { + } else { fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, MySQLConstants.DEFAULT_DATE_FORMAT); } } @@ -173,11 +173,11 @@ public class MysqlQueryProvider extends QueryProvider { if (f.getDeType() == 2 || f.getDeType() == 3) { fieldName = String.format(MySQLConstants.UNIX_TIMESTAMP, originField) + "*1000"; } else { - if(f.getType().equalsIgnoreCase("YEAR")){ + if (f.getType().equalsIgnoreCase("YEAR")) { fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originField + ",'-01-01')", MySQLConstants.DEFAULT_DATE_FORMAT); - }else if(f.getType().equalsIgnoreCase("TIME")){ + } else if (f.getType().equalsIgnoreCase("TIME")) { fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(1970-01-01 " + originField + ")", MySQLConstants.DEFAULT_DATE_FORMAT); - }else { + } else { fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, MySQLConstants.DEFAULT_DATE_FORMAT); } } @@ -1137,11 +1137,11 @@ public class MysqlQueryProvider extends QueryProvider { if (x.getDeType() == 2 || x.getDeType() == 3) { fieldName = String.format(MySQLConstants.UNIX_TIMESTAMP, originField) + "*1000"; } else if (x.getDeType() == 1) { - if(x.getType().equalsIgnoreCase("YEAR")){ + if (x.getType().equalsIgnoreCase("YEAR")) { fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originField + ",'-01-01')", transDateFormat(x.getDateStyle(), x.getDatePattern())); - }else if(x.getType().equalsIgnoreCase("TIME")){ + } else if (x.getType().equalsIgnoreCase("TIME")) { fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(1970-01-01 " + originField + ")", MySQLConstants.DEFAULT_DATE_FORMAT); - }else { + } else { String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, format); } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 18082321dc..0381ad1d84 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1790,7 +1790,7 @@ export default { driver_name: 'Driver name:', drive_type: 'Drive type', add_driver: 'Add driver', - diver_on_the_left: 'Please select drive on the left', + diver_on_the_left: 'Please select the driver on the left', no_data_table: 'No data table', on_the_left: 'Please select the data source on the left', table_name: 'Table name:',