From 3a09b072f180f9d4bf81cf2e56dcbbdff6944cef Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 27 Sep 2022 18:18:59 +0800 Subject: [PATCH 01/10] =?UTF-8?q?revert:=20=E5=B1=8F=E8=94=BD=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/list/PanelViewShow.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue index dde235c31a..4400374e99 100644 --- a/frontend/src/views/panel/list/PanelViewShow.vue +++ b/frontend/src/views/panel/list/PanelViewShow.vue @@ -60,7 +60,6 @@ {{ $t('panel.export_to_panel') }} {{ $t('panel.export_to_pdf') }} {{ $t('panel.export_to_img') }} - {{ $t('panel.export_to_app') }} From a107d1d4327bb49cd15ef921dc5f10cd47a0d9b4 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 27 Sep 2022 18:24:44 +0800 Subject: [PATCH 02/10] =?UTF-8?q?perf(=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?):=20=E5=88=A0=E9=99=A4=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/user/userEditer.vue | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/frontend/src/views/system/user/userEditer.vue b/frontend/src/views/system/user/userEditer.vue index f790ada9c0..b01ac3dfa8 100644 --- a/frontend/src/views/system/user/userEditer.vue +++ b/frontend/src/views/system/user/userEditer.vue @@ -165,16 +165,6 @@ - - - - - - - - - - Date: Wed, 28 Sep 2022 10:20:29 +0800 Subject: [PATCH 03/10] =?UTF-8?q?fix:=20=E4=B8=8D=E5=90=8C=E7=9A=84sql=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=8F=82=E6=95=B0=E5=90=8C=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/chart/ChartViewService.java | 31 ++++++++++++------- .../service/dataset/DataSetTableService.java | 12 +++---- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index e29cf1e558..16e6f6569f 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -664,12 +664,14 @@ public class ChartViewService { } boolean hasParameters = false; if (StringUtils.isNotEmpty(table.getSqlVariableDetails())) { - List sqlVariables = new Gson().fromJson(table.getSqlVariableDetails(), new TypeToken>() { - }.getType()); + List sqlVariables = new Gson().fromJson(table.getSqlVariableDetails(), new TypeToken>() {}.getType()); for (String parameter : Optional.ofNullable(request.getParameters()).orElse(new ArrayList<>())) { if (sqlVariables.stream().map(SqlVariableDetails::getVariableName).collect(Collectors.toList()).contains(parameter)) { hasParameters = true; } + if (parameter.contains("|DE|") && table.getId().equals(parameter.split("|DE|")[0]) && sqlVariables.stream().map(SqlVariableDetails::getVariableName).collect(Collectors.toList()).contains(parameter.split("|DE|")[1])) { + hasParameters = true; + } } } @@ -1591,10 +1593,7 @@ public class ChartViewService { } private String handleVariable(String sql, ChartExtRequest requestList, QueryProvider qp, DataSetTableDTO table, Datasource ds) throws Exception { - - List sqlVariables = new Gson().fromJson(table.getSqlVariableDetails(), new TypeToken>() { - }.getType()); - + List sqlVariables = new Gson().fromJson(table.getSqlVariableDetails(), new TypeToken>() {}.getType()); if (requestList != null && CollectionUtils.isNotEmpty(requestList.getFilter())) { for (ChartExtFilterRequest chartExtFilterRequest : requestList.getFilter()) { if (CollectionUtils.isEmpty(chartExtFilterRequest.getValue())) { @@ -1605,12 +1604,22 @@ public class ChartViewService { } for (String parameter : chartExtFilterRequest.getParameters()) { - List parameters = sqlVariables.stream().filter(item -> item.getVariableName().equalsIgnoreCase(parameter)).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(parameters)) { - String filter = qp.transFilter(chartExtFilterRequest, parameters.get(0)); - sql = sql.replace("${" + parameter + "}", filter); + if(parameter.contains("|DE")){ + if(!parameter.split("|DE|")[0].equals(table.getId())){ + continue; + } + List parameters = sqlVariables.stream().filter(item -> item.getVariableName().equalsIgnoreCase(parameter.split("|DE|")[1])).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(parameters)) { + String filter = qp.transFilter(chartExtFilterRequest, parameters.get(0)); + sql = sql.replace("${" + parameter.split("|DE|")[1] + "}", filter); + } + }else { + List parameters = sqlVariables.stream().filter(item -> item.getVariableName().equalsIgnoreCase(parameter)).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(parameters)) { + String filter = qp.transFilter(chartExtFilterRequest, parameters.get(0)); + sql = sql.replace("${" + parameter + "}", filter); + } } - } } } diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 219e7f8a34..f1be09918c 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -961,16 +961,14 @@ public class DataSetTableService { return new ArrayList<>(); } List sqlVariableDetails = new ArrayList<>(); - List sqlVariableNames = new ArrayList<>(); for (DatasetTable datasetTable : datasetTables) { if (StringUtils.isNotEmpty(datasetTable.getSqlVariableDetails())) { List sqlVariables = new Gson().fromJson(datasetTable.getSqlVariableDetails(), new TypeToken>() { }.getType()); for (SqlVariableDetails sqlVariable : sqlVariables) { - if (!sqlVariableNames.contains(sqlVariable.getVariableName())) { - sqlVariableNames.add(sqlVariable.getVariableName()); - sqlVariableDetails.add(sqlVariable); - } + sqlVariable.setId(datasetTable.getId() + "|DE|" + sqlVariable.getVariableName()); + sqlVariable.setVariableName("[" + datasetTable.getName() + "]-" + sqlVariable.getVariableName()); + sqlVariableDetails.add(sqlVariable); } } } @@ -1063,9 +1061,9 @@ public class DataSetTableService { Select subSelectTmp = (Select) CCJSqlParserUtil.parse(removeVariables(selectBody.toString(), dsType)); PlainSelect subPlainSelect = ((PlainSelect) subSelectTmp.getSelectBody()); subSelect.setSelectBody(subPlainSelect); - if(dsType.equals(DatasourceTypes.oracle.getType())){ + if (dsType.equals(DatasourceTypes.oracle.getType())) { subSelect.setAlias(new Alias(fromItem.getAlias().toString(), false)); - }else { + } else { subSelect.setAlias(new Alias(fromItem.getAlias().toString())); } plainSelect.setFromItem(subSelect); From 9546d512cf7d268b2d2f8acdbe32e684cb582221 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 28 Sep 2022 10:25:15 +0800 Subject: [PATCH 04/10] =?UTF-8?q?fix:=20=E4=B8=8D=E5=90=8C=E7=9A=84sql=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=8F=82=E6=95=B0=E5=90=8C=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel/filter/filterMain/FilterControl.vue | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/frontend/src/views/panel/filter/filterMain/FilterControl.vue index 2d6d8ecd2e..149922bd3a 100644 --- a/frontend/src/views/panel/filter/filterMain/FilterControl.vue +++ b/frontend/src/views/panel/filter/filterMain/FilterControl.vue @@ -107,8 +107,8 @@
@@ -174,12 +174,27 @@ export default { { id: 'HH', name: 'HH' }, { id: 'HH:mm', name: 'HH:mm' }, { id: 'HH:mm:ss', name: 'HH:mm:ss' } - ] - } }, computed: {}, + watch: { + 'childViews.datasetParams': { + handler(newName, oldName) { + if (this.attrs.parameters.length > 0) { + const parameters = [] + for (var i = 0; i < this.attrs.parameters.length; i++) { + for (var j = 0; j < this.childViews.datasetParams.length; j++) { + if (this.childViews.datasetParams[j].id.split('|DE|')[1] === this.attrs.parameters[i]) { + parameters.push(this.childViews.datasetParams[j].id) + } + } + } + this.attrs.parameters = parameters + } + } + } + }, created() { this.attrs = this.controlAttrs @@ -213,6 +228,7 @@ export default { }, showTitleChange(value) { if (!value) { + this.attrs.title = '' this.element.style.backgroundColor = '' } this.fillAttrs2Filter() From f4cb7e8533a3440533b25f9e8d6385292d55fe53 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 28 Sep 2022 10:48:17 +0800 Subject: [PATCH 05/10] =?UTF-8?q?refactor:=20=E5=B1=8F=E8=94=BDecharts?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=81=94=E5=8A=A8=E5=92=8C=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/Editor/SettingMenu.vue | 8 ++++++-- .../src/components/canvas/custom-component/UserView.vue | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/Editor/SettingMenu.vue index c951e7fbc5..2ad28034c0 100644 --- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue +++ b/frontend/src/components/canvas/components/Editor/SettingMenu.vue @@ -83,10 +83,14 @@ export default { }, computed: { linkJumpSetShow() { - return this.curComponent.type === 'view' && !this.jumpExcludeViewType.includes(this.curComponent.propValue.innerType) + return this.curComponent.type === 'view' + && !this.jumpExcludeViewType.includes(this.curComponent.propValue.innerType) + && !(this.curComponent.propValue.innerType.includes('table') && this.curComponent.propValue.render === 'echarts') }, linkageSettingShow() { - return this.curComponent.type === 'view' && !this.linkageExcludeViewType.includes(this.curComponent.propValue.innerType) + return this.curComponent.type === 'view' + && !this.linkageExcludeViewType.includes(this.curComponent.propValue.innerType) + && !(this.curComponent.propValue.innerType.includes('table') && this.curComponent.propValue.render === 'echarts') }, panelInfo() { return this.$store.state.panel.panelInfo diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index f43c538304..4a857b0360 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -680,6 +680,7 @@ export default { } } Vue.set(this.element.propValue, 'innerType', chartDetails.type) + Vue.set(this.element.propValue, 'render', chartDetails.render) if (chartDetails.type === 'richTextView') { this.$nextTick(() => { bus.$emit('initCurFields-' + this.element.id) From 0d7b1f1805527dbe4da76578e6d58e9ef22bc378 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 28 Sep 2022 11:03:29 +0800 Subject: [PATCH 06/10] =?UTF-8?q?fix:=20sql=20=E5=8F=82=E6=95=B0=E8=AF=86?= =?UTF-8?q?=E5=88=AB=E7=AC=A6=E6=8B=BC=E6=8E=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/service/chart/ChartViewService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 16e6f6569f..d56a687314 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -1604,7 +1604,7 @@ public class ChartViewService { } for (String parameter : chartExtFilterRequest.getParameters()) { - if(parameter.contains("|DE")){ + if(parameter.contains("|DE|")){ if(!parameter.split("|DE|")[0].equals(table.getId())){ continue; } From 76098ef5c5cb083c33617168e5962121a37cc67d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 28 Sep 2022 11:04:02 +0800 Subject: [PATCH 07/10] =?UTF-8?q?fix:=20mysql=20=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=94=99=E8=AF=AF?= 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, 3 insertions(+), 3 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 5f16332cd1..527bbe3254 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 @@ -117,7 +117,7 @@ public class MysqlQueryProvider extends QueryProvider { 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); + 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); } @@ -176,7 +176,7 @@ public class MysqlQueryProvider extends QueryProvider { 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); + 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); } @@ -1140,7 +1140,7 @@ public class MysqlQueryProvider extends QueryProvider { 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); + 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 c47db49f3e4493ba5f62734598c4e06484da7e12 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 28 Sep 2022 11:16:34 +0800 Subject: [PATCH 08/10] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=86=E7=BB=84=E6=9F=B1=E7=8A=B6=E5=9B=BE=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/ChartViewService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index e29cf1e558..b3189175dc 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -647,6 +647,12 @@ public class ChartViewService { xAxis = xAxis.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); yAxis = yAxis.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); break; + case "bar-group": + xAxis = xAxis.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || (!desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList()); + yAxis = yAxis.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || (!desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList()); + xAxisBase = xAxisBase.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || (!desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList()); + xAxisExt = xAxisExt.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || (!desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList()); + break; default: xAxis = xAxis.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || (!desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList()); yAxis = yAxis.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || (!desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList()); From 9367a535c56177c4b6e1c15d78b553686abd90b6 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 28 Sep 2022 11:21:07 +0800 Subject: [PATCH 09/10] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 2 +- frontend/src/lang/tw.js | 6 +++--- frontend/src/lang/zh.js | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index f14fe50959..9940582d9b 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1545,7 +1545,7 @@ export default { preview_100_data: 'Show 100 lines data', invalid_table_check: 'Please sync data first.', parse_error: 'Parse failed,please check.Reference：https://dataease.io/docs/user_manual/dataset_configuration/dataset_Excel', - origin_field_type: 'Origin Type', + origin_field_type: 'Field Origin Type', edit_excel_table: 'Edit Excel Dataset', edit_excel: 'Edit Excel', excel_replace: 'Replace', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 212c7e7b65..eeecbe3040 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1462,8 +1462,8 @@ export default { create_view: '創建視圖', data_preview: '數據預覽', field_type: '字段類型', - field_name: '字段名', - field_origin_name: '原始名', + field_name: '字段名稱', + field_origin_name: '原始名稱', field_check: '選中', update_info: '更新信息', join_view: '數據關聯', @@ -1545,7 +1545,7 @@ export default { preview_100_data: '顯示前100行數據', invalid_table_check: '非直連數據集請先完成數據同步', parse_error: 'Excel解析失敗，請檢查格式、字段等信息。具體參考：https://dataease.io/docs/user_manual/dataset_configuration/dataset_Excel', - origin_field_type: '原始類型', + origin_field_type: '字段原始類型', edit_excel_table: '編輯Excel數據集', edit_excel: '編輯Excel', excel_replace: '替換', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index c1ba56582b..e1f5e5861a 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1461,8 +1461,8 @@ export default { create_view: '创建视图', data_preview: '数据预览', field_type: '字段类型', - field_name: '字段名', - field_origin_name: '原始名', + field_name: '字段名称', + field_origin_name: '原始名称', field_check: '选中', update_info: '更新信息', join_view: '数据关联', @@ -1544,7 +1544,7 @@ export default { preview_100_data: '显示前100行数据', invalid_table_check: '非直连数据集请先完成数据同步', parse_error: 'Excel解析失败，请检查格式、字段等信息。具体参考：https://dataease.io/docs/user_manual/dataset_configuration/dataset_Excel', - origin_field_type: '原始类型', + origin_field_type: '字段原始类型', edit_excel_table: '编辑Excel数据集', edit_excel: '编辑Excel', excel_replace: '替换', From 0891e0aff0acddc18ba8f0bae8e18463d51ed233 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 28 Sep 2022 11:50:35 +0800 Subject: [PATCH 10/10] =?UTF-8?q?perf(=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?):=20=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=E7=BB=91?= =?UTF-8?q?=E5=AE=9ADE=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/dataease/ext/AuthMapper.xml | 6 +++--- .../java/io/dataease/plugins/server/XDingtalkServer.java | 2 +- .../main/java/io/dataease/plugins/server/XLarkServer.java | 2 +- .../main/java/io/dataease/plugins/server/XWecomServer.java | 2 +- backend/src/main/resources/db/migration/V40__1.15.sql | 2 +- frontend/src/layout/components/Topbar.vue | 2 +- frontend/src/router/index.js | 6 +----- 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/backend/src/main/java/io/dataease/ext/AuthMapper.xml b/backend/src/main/java/io/dataease/ext/AuthMapper.xml index 2d897cfd1a..ac07e54e79 100644 --- a/backend/src/main/java/io/dataease/ext/AuthMapper.xml +++ b/backend/src/main/java/io/dataease/ext/AuthMapper.xml @@ -109,7 +109,7 @@ select - user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` + u.user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user_assist a left join @@ -129,7 +129,7 @@