dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into pr@dev_memory_component

Browse Source
This commit is contained in:
dataeaseShu 2022-12-29 16:59:12 +08:00
commit 9d8b415a24
9 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
View File

@ -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<DatasetTableField> fields) {
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP LIMIT DE_OFFSET, DE_PAGE_SIZE ", fields, null);

1
backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
View File

@ -1338,7 +1338,6 @@ public class SqlserverQueryProvider extends QueryProvider {
public List<Dateformat> 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" +

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

@ -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())) {

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

@ -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"));
}
}

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

@ -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);
}

4
frontend/src/components/canvas/store/copy.js
View File

@ -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 = []
}

6
frontend/src/components/deDrag/index.vue
View File

@ -79,17 +79,17 @@
@mousedown="elementMouseDown"
/>
<div
v-show="!this.element.editing"
v-show="!this.element.editing && this.element.type !=='de-tabs'"
class="de-drag-area de-drag-right"
@mousedown="elementMouseDown"
/>
<div
v-show="!this.element.editing"
v-show="!this.element.editing && this.element.type !=='de-tabs'"
class="de-drag-area de-drag-bottom"
@mousedown="elementMouseDown"
/>
<div
v-show="!this.element.editing"
v-show="!this.element.editing && this.element.type !=='de-tabs'"
class="de-drag-area de-drag-left"
@mousedown="elementMouseDown"
/>

17
frontend/src/views/panel/appTemplate/component/TemplateList.vue
View File

@ -47,7 +47,7 @@
@command="(type) => clickMore(type, ele)"
>
<span class="el-dropdown-link">
<i class="el-icon-more" />
<i class="el-icon-more"/>
</span>
<el-dropdown-menu
slot="dropdown"
@ -63,13 +63,13 @@
icon="el-icon-edit"
command="edit"
>
{{ $t("commons.edit") }}
{{ $t('commons.edit') }}
</el-dropdown-item>
<el-dropdown-item
icon="el-icon-delete"
command="delete"
>
{{ $t("commons.delete") }}
{{ $t('commons.delete') }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@ -83,7 +83,7 @@
secondary
@click="add()"
>
{{ $t("panel.add_app_category") }}
{{ $t('panel.add_app_category') }}
</deBtn>
</div>
</template>
@ -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;
}

21
frontend/src/views/panel/template/component/TemplateList.vue
View File

@ -47,7 +47,7 @@
@command="(type) => clickMore(type, ele)"
>
<span class="el-dropdown-link">
<i class="el-icon-more" />
<i class="el-icon-more"/>
</span>
<el-dropdown-menu
slot="dropdown"
@ -57,19 +57,19 @@
icon="el-icon-upload2"
command="import"
>
{{ $t("panel.import") }}
{{ $t('panel.import') }}
</el-dropdown-item>
<el-dropdown-item
icon="el-icon-edit"
command="edit"
>
{{ $t("panel.rename") }}
{{ $t('panel.rename') }}
</el-dropdown-item>
<el-dropdown-item
icon="el-icon-delete"
command="delete"
>
{{ $t("panel.delete") }}
{{ $t('panel.delete') }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@ -83,7 +83,7 @@
secondary
@click="add()"
>
{{ $t("panel.add_category") }}
{{ $t('panel.add_category') }}
</deBtn>
</div>
</template>
@ -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;
}