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/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())) { 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")); } } 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); } 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 = [] } 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" />
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; }