From f73ef989bc999788e67c8cc78404743e5dadb0b2 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 28 Dec 2022 15:21:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E8=A7=A3=E6=9E=90sql=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/query/sqlserver/SqlserverQueryProvider.java | 1 - .../io/dataease/service/dataset/DataSetTableService.java | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java index 8819b4da72..d178c7279e 100644 --- a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java @@ -1338,7 +1338,6 @@ public class SqlserverQueryProvider extends QueryProvider { public List dateformat() { return JSONArray.parseArray("[\n" + "{\"dateformat\": \"102\", \"desc\": \"yyyy.mm.dd\"},\n" + - "{\"dateformat\": \"120\", \"desc\": \"yyyy-mm-dd\"},\n" + "{\"dateformat\": \"111\", \"desc\": \"yyyy/mm/dd\"},\n" + "{\"dateformat\": \"112\", \"desc\": \"yyyymmdd\"},\n" + "{\"dateformat\": \"120\", \"desc\": \"yyyy-mm-dd hh:mi:ss\"}\n" + 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 0d030d94f4..0b1291928b 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -2821,7 +2821,7 @@ public class DataSetTableService { boolean hasSubBinaryExpression = false; try { BinaryExpression leftBinaryExpression = (BinaryExpression) expr.getLeftExpression(); - hasSubBinaryExpression = leftBinaryExpression.getLeftExpression() instanceof Expression; + hasSubBinaryExpression = leftBinaryExpression instanceof AndExpression || leftBinaryExpression instanceof OrExpression; } catch (Exception e) { e.printStackTrace(); } @@ -2836,8 +2836,7 @@ public class DataSetTableService { hasSubBinaryExpression = false; try { BinaryExpression rightBinaryExpression = (BinaryExpression) expr.getRightExpression(); - hasSubBinaryExpression = rightBinaryExpression.getRightExpression() instanceof BinaryExpression; - + hasSubBinaryExpression = rightBinaryExpression instanceof AndExpression || rightBinaryExpression instanceof OrExpression;; } catch (Exception e) { } if (expr.getRightExpression() instanceof BinaryExpression && !hasSubBinaryExpression && hasVariable(expr.getRightExpression().toString())) { From 415f36dcea8f55aa2399ef2302b8bc090a3ffa1a Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 29 Dec 2022 12:11:04 +0800 Subject: [PATCH 2/6] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20Ta?= =?UTF-8?q?b=E5=86=85=E7=BB=84=E4=BB=B6=E5=A4=8D=E5=88=B6=E7=9A=84?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=BF=98=E6=94=BE=E7=BD=AE=E5=9C=A8tab?= =?UTF-8?q?=E5=86=85=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/store/copy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/store/copy.js b/frontend/src/components/canvas/store/copy.js index 0912e41475..4d740986e7 100644 --- a/frontend/src/components/canvas/store/copy.js +++ b/frontend/src/components/canvas/store/copy.js @@ -126,8 +126,8 @@ export default { Vue.set(newView, 'needAdaptor', needAdaptor) newView.id = uuid.v1() newView.propValue.viewId = res.data - newView['canvasId'] = 'canvas-main' - newView['canvasPid'] = '0' + newView['canvasId'] = data.canvasId + newView['canvasPid'] = data.canvasPid if (newView.filters && newView.filters.length) { newView.filters = [] } From de3452893a0b86693c45e4eb605fdce7c711599f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 29 Dec 2022 14:15:12 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix(=E5=BA=94=E7=94=A8):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8=E6=97=B6=E7=BC=A9?= =?UTF-8?q?=E7=95=A5=E5=9B=BE=E5=8F=AF=E8=83=BD=E6=9C=AA=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/panel/PanelAppTemplateService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java index 1a5770da5a..51ce96c0a5 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java @@ -104,7 +104,7 @@ public class PanelAppTemplateService { BeanUtils.copyBean(requestTemplate, request); //Store static resource into the server if (StringUtils.isNotEmpty(request.getSnapshot())) { - String snapshotName = "app-template-" + request.getId() + ".jpeg"; + String snapshotName = "app-template-" + UUIDUtil.getUUIDAsString() + ".jpeg"; staticResourceService.saveSingleFileToServe(snapshotName, request.getSnapshot().replace("data:image/jpeg;base64,", "")); requestTemplate.setSnapshot("/" + UPLOAD_URL_PREFIX + '/' + snapshotName); } From 442b76c0131f8c4b2d2071449c44ad1b34436917 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 29 Dec 2022 14:27:59 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=86=E9=A1=B5=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 | 8 ++++++++ .../io/dataease/service/dataset/ExtractDataService.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) 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 566488b0c2..20cc4c0e6e 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 @@ -811,6 +811,14 @@ public class MysqlQueryProvider extends QueryProvider { return MessageFormat.format("SELECT {0} FROM {1} LIMIT DE_OFFSET, DE_PAGE_SIZE ", StringUtils.join(array, ","), table); } + public String getTotalCount(boolean isTable, String sql, Datasource ds) { + if(isTable){ + return "SELECT COUNT(*) from " + String.format(MySQLConstants.KEYWORD_TABLE, sql); + }else { + return "SELECT COUNT(*) from ( " + sql + " ) DE_COUNT_TEMP"; + } + } + @Override public String createRawQuerySQLAsTmp(String sql, List fields) { return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP LIMIT DE_OFFSET, DE_PAGE_SIZE ", fields, null); diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 73f1c37050..d2cd3b99c5 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -452,7 +452,7 @@ public class ExtractDataService { extractDataByKettle(datasetTable, datasource, datasetTableFields, extractType, sql.get("selectSQL").replace("DE_OFFSET", offset.toString()).replace("DE_PAGE_SIZE", extractPageSize.toString()).replace("DE_ALL", all.toString())); } } else { - extractDataByKettle(datasetTable, datasource, datasetTableFields, extractType, selectSQL); + extractDataByKettle(datasetTable, datasource, datasetTableFields, extractType, sql.get("selectSQL")); } } From 6d5769529fbfa72b349c3c0f89fd697bcebce79b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 29 Dec 2022 14:50:53 +0800 Subject: [PATCH 5/6] =?UTF-8?q?style:=20=E5=AD=97=E4=BD=93=E6=A0=B7?= =?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 --- .../appTemplate/component/TemplateList.vue | 17 ++++++++++----- .../panel/template/component/TemplateList.vue | 21 ++++++++++++------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/frontend/src/views/panel/appTemplate/component/TemplateList.vue b/frontend/src/views/panel/appTemplate/component/TemplateList.vue index 16b8414afe..cc502c0606 100644 --- a/frontend/src/views/panel/appTemplate/component/TemplateList.vue +++ b/frontend/src/views/panel/appTemplate/component/TemplateList.vue @@ -47,7 +47,7 @@ @command="(type) => clickMore(type, ele)" > - + - {{ $t("commons.edit") }} + {{ $t('commons.edit') }} - {{ $t("commons.delete") }} + {{ $t('commons.delete') }} @@ -83,7 +83,7 @@ secondary @click="add()" > - {{ $t("panel.add_app_category") }} + {{ $t('panel.add_app_category') }} @@ -179,12 +179,14 @@ export default { .de-template-list { height: 100%; position: relative; + ul { margin: 16px 0 20px 0; padding: 0; overflow-y: auto; max-height: calc(100% - 90px); } + li { list-style: none; width: 100%; @@ -209,12 +211,14 @@ export default { color: #8f959e; margin-right: 9px; } + .more { position: absolute; top: 50%; right: 10px; transform: translateY(-50%); display: none; + .el-icon-more { width: 24px; height: 24px; @@ -247,16 +251,19 @@ export default { li.select { background: var(--deWhiteHover, #3370ff); - color: var(--primary, #3370ff); + color: var(--TextActive, #f4f4f5); } + .de-btn-fix { position: absolute; bottom: 0; left: 0; } } + .de-template-dropdown { margin-top: 0 !important; + .popper__arrow { display: none !important; } diff --git a/frontend/src/views/panel/template/component/TemplateList.vue b/frontend/src/views/panel/template/component/TemplateList.vue index 87db45ec19..b52312dde6 100644 --- a/frontend/src/views/panel/template/component/TemplateList.vue +++ b/frontend/src/views/panel/template/component/TemplateList.vue @@ -47,7 +47,7 @@ @command="(type) => clickMore(type, ele)" > - + - {{ $t("panel.import") }} + {{ $t('panel.import') }} - {{ $t("panel.rename") }} + {{ $t('panel.rename') }} - {{ $t("panel.delete") }} + {{ $t('panel.delete') }} @@ -83,7 +83,7 @@ secondary @click="add()" > - {{ $t("panel.add_category") }} + {{ $t('panel.add_category') }} @@ -174,12 +174,14 @@ export default { .de-template-list { height: 100%; position: relative; + ul { margin: 16px 0 20px 0; padding: 0; overflow-y: auto; max-height: calc(100% - 90px); } + li { list-style: none; width: 100%; @@ -200,7 +202,7 @@ export default { overflow: hidden; text-overflow: ellipsis; - .text-template-overflow{ + .text-template-overflow { display: inline-block; max-width: 87%; overflow: hidden; @@ -212,12 +214,14 @@ export default { color: #8f959e; margin-right: 9px; } + .more { position: absolute; top: 50%; right: 10px; transform: translateY(-50%); display: none; + .el-icon-more { width: 24px; height: 24px; @@ -250,16 +254,19 @@ export default { li.select { background: var(--deWhiteHover, #3370ff); - color: var(--primary, #3370ff); + color: var(--TextActive, #f4f4f5); } + .de-btn-fix { position: absolute; bottom: 0; left: 0; } } + .de-template-dropdown { margin-top: 0 !important; + .popper__arrow { display: none !important; } From a44c6e264871b46113aeff856d5b7f8c5f48204e Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 29 Dec 2022 15:01:32 +0800 Subject: [PATCH 6/6] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4Tab=E7=BB=84=E4=BB=B6=E7=9A=84=E6=8B=96?= =?UTF-8?q?=E6=8B=BD=E5=8C=BA=EF=BC=8CTab=E7=BB=84=E4=BB=B6=E6=8B=96?= =?UTF-8?q?=E6=8B=BD=E5=8C=BA=E5=9B=BA=E5=AE=9A=E5=9C=A8=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E4=B8=8E=E5=86=85=E9=83=A8=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=8B=96=E6=8B=BD=E5=8C=BA=E5=9F=9F=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/deDrag/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/deDrag/index.vue b/frontend/src/components/deDrag/index.vue index 7ac61779e8..251764faa9 100644 --- a/frontend/src/components/deDrag/index.vue +++ b/frontend/src/components/deDrag/index.vue @@ -79,17 +79,17 @@ @mousedown="elementMouseDown" />