center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' into pr@dev_memory_component

Browse Source
This commit is contained in:
dataeaseShu 2023-03-07 14:11:15 +08:00
commit 73b0c3090b
19 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId>
<version>1.18.4</version>
<version>${dataease.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -204,7 +204,7 @@
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-interface</artifactId>
<version>1.18.4</version>
<version>${dataease.version}</version>
<exclusions>
<exclusion>
<artifactId>guava</artifactId>
@ -215,12 +215,12 @@
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-view</artifactId>
<version>1.18.4</version>
<version>${dataease.version}</version>
</dependency>
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-datasource</artifactId>
<version>1.18.4</version>
<version>${dataease.version}</version>
</dependency>
<!-- kettle及数据源依赖 -->
<dependency>

2
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -1846,7 +1846,7 @@ public class ChartViewService {
}
}
}
sql = dataSetTableService.handleVariableDefaultValue(sql, table.getSqlVariableDetails(), ds.getType());
sql = dataSetTableService.handleVariableDefaultValue(sql, null, ds.getType());
return sql;
}

3
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -2264,6 +2264,9 @@ public class DataSetTableService {
}
Set<String> nameSet = new HashSet<>();
for (DataSetTableRequest table : datasetTable) {
if(StringUtils.isEmpty(table.getName())){
throw new RuntimeException(Translator.get("I18n_name_cant_empty"));
}
nameSet.add(table.getName());
}
if (nameSet.size() != datasetTable.size()) {

8
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -757,7 +757,13 @@ public class ExtractDataService {
List<List<String>> csvData = new ArrayList<>();
String line;
while ((line = reader.readLine()) != null) {
csvData.add(Arrays.asList(line.split(",")));
if(line.endsWith(",")){
List<String> list = new ArrayList<>(Arrays.asList(line.split(",")));
list.add("");
csvData.add(list);
}else {
csvData.add(Arrays.asList(line.split(",")));
}
}
ExcelSheetData csvSheetData = new ExcelSheetData();
String[] fieldArray = fields.stream().map(TableField::getFieldName).toArray(String[]::new);

2
backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java
View File

@ -363,7 +363,7 @@ public class PanelAppTemplateService {
//替换datasetId
chartViewField.setTableId(datasetsRealMap.get(chartViewField.getTableId()));
//替换chartViewId
chartViewField.setChartId(chartViewsRealMap.get(chartViewField.getId()));
chartViewField.setChartId(chartViewsRealMap.get(chartViewField.getChartId()));
//替换datasetFieldId
datasetFieldsRealMap.forEach((k, v) -> {
chartViewField.setOriginName(chartViewField.getOriginName().replaceAll(k, v));

1
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -272,3 +272,4 @@ I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=Default template only screenshot
\u8FB9\u68468=Border 8
\u8FB9\u68469=Border 9
\u8FB9\u684610=Border 10
I18n_name_cant_empty=Name can not be empty!

1
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -262,4 +262,5 @@ I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6743\u9650
I18N_CRON_ERROR=cron\u8868\u8FBE\u5F0F\u9519\u8BEF
I18N_PANEL_PDF_TEMPLATE_WITH_PARAMS=\u9ED8\u8BA4\u6A21\u677F(\u52A0\u53C2\u6570\u6837\u5F0F)
I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=\u9ED8\u8BA4\u6A21\u677F(\u53EA\u622A\u56FE)
I18n_name_cant_empty=名称不能为空！

1
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -268,3 +268,4 @@ I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=\u9ED8\u8A8D\u6A21\u677F(\u53EA\u622A\u5716)
\u8FB9\u68468=\u908A\u6846 8
\u8FB9\u68469=\u908A\u6846 9
\u8FB9\u684610=\u908A\u6846 10
I18n_name_cant_empty=名稱不能為空！

2
frontend/package.json
View File

@ -1,6 +1,6 @@
{
"name": "dataease",
"version": "1.18.4",
"version": "1.18.5",
"description": "dataease front",
"private": true,
"scripts": {

2
frontend/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId>
<version>1.18.4</version>
<version>${dataease.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
frontend/src/lang/en.js
View File

@ -1520,13 +1520,13 @@ export default {
},
dataset: {
scope_edit: 'Effective only when editing',
scope_all: 'Global effective',
scope_all: 'Effect globally when the dataset is previewed',
spend_time: 'Spend',
sql: 'SQL',
sql_result: 'Result',
parse_filed: 'Parse Field',
field_rename: 'Rename Field',
params_work: 'Effective only when editing SQL',
params_work: 'Effective only when editing: parameter values are effective only when editing data sets; Global Effective: It takes effect in dataset view, preview, and view where dataset is used.',
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}\'',
select_year: 'Select Year',

4
frontend/src/lang/tw.js
View File

@ -1514,13 +1514,13 @@ export default {
},
dataset: {
scope_edit: '僅編輯時生效',
scope_all: '全域生效',
scope_all: '數据集預覽時全域生效',
spend_time: '耗時',
sql: 'SQL 語句',
sql_result: '運行結果',
parse_filed: '解析字段',
field_rename: '字段重命名',
params_work: '僅在編輯 sql 時生效',
params_work: '僅編輯時生效：參數值僅在數据集編輯時生效； 全域生效：在數据集查看、預覽、以及用到數据集的視圖中均生效。',
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}\'',
selesql_variable_limit_2ct_year: '選擇年',

4
frontend/src/lang/zh.js
View File

@ -1513,13 +1513,13 @@ export default {
},
dataset: {
scope_edit: '仅编辑时生效',
scope_all: '全局生效',
scope_all: '数据集预览时全局生效',
spend_time: '耗时',
sql: 'SQL 语句',
sql_result: '运行结果',
parse_filed: '解析字段',
field_rename: '字段重命名',
params_work: '仅在编辑sql时生效',
params_work: '仅编辑时生效：参数值仅在数据集编辑时生效；全局生效：在数据集查看、预览、以及用到数据集的视图中均生效。',
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}\'',

6
frontend/src/views/dataset/data/UpdateInfo.vue
View File

@ -574,7 +574,7 @@ export default {
startTime: '',
rate: 'SIMPLE',
cron: '',
endTime: '',
endTime: 0,
end: '0',
extraData: {
simple_cron_type: 'hour',
@ -779,6 +779,7 @@ export default {
this.taskForm.name =
this.table.name + ' ' + this.$t('dataset.task_update')
this.taskForm.startTime = new Date()
this.taskForm.endTime = new Date()
this.update_task_dialog_title = this.$t('dataset.task_add_title')
} else {
// update
@ -908,6 +909,7 @@ export default {
}
this.incrementalConfig.tableId = this.table.id
task.startTime = new Date(task.startTime).getTime()
console.log(task.endTime)
task.endTime = new Date(task.endTime).getTime()
task.tableId = this.table.id
const form = JSON.parse(JSON.stringify(task))
@ -1030,7 +1032,7 @@ export default {
onRateChange() {
if (this.taskForm.rate === 'SIMPLE') {
this.taskForm.end = '0'
this.taskForm.endTime = ''
this.taskForm.endTime = 0
this.taskForm.cron = ''
this.showCron = false
}

5
frontend/src/views/dataset/data/UpdateRecords.vue
View File

@ -530,7 +530,7 @@ export default {
startTime: '',
rate: 'SIMPLE',
cron: '',
endTime: '',
endTime: 0,
end: '0',
extraData: {
simple_cron_type: 'hour',
@ -707,6 +707,7 @@ export default {
this.resetTaskForm()
this.taskForm.name = this.table.name + ' ' + this.$t('dataset.task_update')
this.taskForm.startTime = new Date()
this.taskForm.endTime = new Date()
this.update_task_dialog_title = this.$t('dataset.task_add_title')
} else {
this.taskForm = JSON.parse(JSON.stringify(task))
@ -854,7 +855,7 @@ export default {
onRateChange() {
if (this.taskForm.rate === 'SIMPLE') {
this.taskForm.end = '0'
this.taskForm.endTime = ''
this.taskForm.endTime = 0
this.taskForm.cron = ''
}
if (this.taskForm.rate === 'SIMPLE_CRON') {

5
frontend/src/views/system/task/Form.vue
View File

@ -295,7 +295,7 @@ export default {
tableId: '',
rate: 'SIMPLE',
cron: '',
endTime: '',
endTime: 0,
end: '0',
extraData: {
simple_cron_type: 'hour',
@ -391,6 +391,7 @@ export default {
this.taskDetail = { datasetName, id, tableId }
if (!id) {
this.taskForm.startTime = new Date()
this.taskForm.endTime = new Date()
return
}
this.getTaskDetail(id)
@ -418,7 +419,7 @@ export default {
onRateChange() {
if (this.taskForm.rate === 'SIMPLE') {
this.taskForm.end = '0'
this.taskForm.endTime = ''
this.taskForm.endTime = 0
this.taskForm.cron = ''
this.showCron = false
}

2
mobile/package.json
View File

@ -1,6 +1,6 @@
{
"name": "dataease-mobile",
"version": "1.18.4",
"version": "1.18.5",
"private": true,
"scripts": {
"serve": "npm run dev:h5",

2
mobile/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId>
<version>1.18.4</version>
<version>${dataease.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

6
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.dataease</groupId>
<artifactId>dataease-server</artifactId>
<version>1.18.4</version>
<version>${dataease.version}</version>
<packaging>pom</packaging>
<parent>
@ -15,6 +15,10 @@
<relativePath/>
</parent>
<properties>
<dataease.version>1.18.5</dataease.version>
</properties>
<name>dataease</name>
<modules>