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

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2022-07-29 11:03:12 +08:00
commit 5083cea4b9
18 changed files with 37 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
View File

@ -1074,7 +1074,7 @@ public class DorisQueryProvider extends QueryProvider {
whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == 1) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(DorisConstants.WHERE_BETWEEN, startTime, endTime);

2
backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
View File

@ -1130,7 +1130,7 @@ public class CKQueryProvider extends QueryProvider {
whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(CKConstants.WHERE_BETWEEN, startTime, endTime);

2
backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
View File

@ -1124,7 +1124,7 @@ public class Db2QueryProvider extends QueryProvider {
whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(Db2Constants.WHERE_BETWEEN, startTime, endTime);

2
backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
View File

@ -1119,7 +1119,7 @@ public class EsQueryProvider extends QueryProvider {
whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == 1) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(EsSqlLConstants.WHERE_BETWEEN, startTime, endTime);

2
backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
View File

@ -1055,7 +1055,7 @@ public class HiveQueryProvider extends QueryProvider {
whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(HiveConstants.WHERE_BETWEEN, startTime, endTime);

2
backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
View File

@ -1060,7 +1060,7 @@ public class ImpalaQueryProvider extends QueryProvider {
whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(ImpalaConstants.WHERE_BETWEEN, startTime, endTime);

2
backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
View File

@ -969,7 +969,7 @@ public class MongoQueryProvider extends QueryProvider {
whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(MongoConstants.WHERE_BETWEEN, startTime, endTime);

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

@ -1060,7 +1060,7 @@ public class MysqlQueryProvider extends QueryProvider {
whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == 1) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(MySQLConstants.WHERE_BETWEEN, startTime, endTime);

2
backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
View File

@ -1123,7 +1123,7 @@ public class OracleQueryProvider extends QueryProvider {
whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == 1) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
String st = String.format(OracleConstants.TO_DATE, "'" + startTime + "'", OracleConstants.DEFAULT_DATE_FORMAT);

2
backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
View File

@ -1086,7 +1086,7 @@ public class PgQueryProvider extends QueryProvider {
whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == 1) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(PgConstants.WHERE_BETWEEN, startTime, endTime);

2
backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
View File

@ -1013,7 +1013,7 @@ public class RedshiftQueryProvider extends QueryProvider {
whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == 1) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(PgConstants.WHERE_BETWEEN, startTime, endTime);

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

@ -1118,7 +1118,7 @@ public class SqlserverQueryProvider extends QueryProvider {
whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(SqlServerSQLConstants.WHERE_BETWEEN, startTime, endTime);

4
frontend/src/components/widget/DeWidget/DeDate.vue
View File

@ -80,7 +80,7 @@ export default {
return widget.isTimeWidget && widget.isTimeWidget()
},
componentType() {
let result = 'date'
let result = this.element.options.attrs.type || 'date'
if (this.isTimeWidget && this.element.options.attrs.showTime) {
result = 'datetime'
}
@ -91,7 +91,7 @@ export default {
if (this.isTimeWidget && this.element.options.attrs.showTime && this.element.options.attrs.accuracy) {
return result + ' ' + this.element.options.attrs.accuracy
}
return result
return null
}
},

35
frontend/src/styles/index.scss
View File

@ -934,11 +934,11 @@ div:focus {
.pagination-cont {
text-align: right;
margin-top: 10px;
::v-deep .el-pager li {
background-color: #fff;
border: 1px solid #bbbfc4;
border-radius: 4px;
color: #1f2329;
.el-pager li {
background-color: #fff !important;
border: 1px solid #bbbfc4 !important;
border-radius: 4px !important;
color: #1f2329 !important;
box-sizing: border-box;
line-height: 26px;
font-family: SF Pro Text;
@ -946,33 +946,32 @@ div:focus {
font-weight: 400;
}
::v-deep .btn-prev,
::v-deep .btn-next {
background: #fff;
background-color: #fff;
border: 1px solid #bbbfc4;
border-radius: 4px;
color: #bbbfc4;
.btn-prev,
.btn-next {
background-color: #fff !important;
border: 1px solid #bbbfc4 !important;
border-radius: 4px !important;
color: #bbbfc4 !important;
}
::v-deep .el-pagination__total {
.el-pagination__total {
font-family: "PingFang SC";
font-style: normal;
font-weight: 400;
font-size: 14px;
line-height: 22px;
color: #1f2329;
color: #1f2329 !important;
line-height: 28px;
}
::v-deep .number.active,
::v-deep .el-input__inner:hover {
border-color: #3370ff;
.number.active,
.el-input__inner:hover {
border-color: #3370ff !important;
color: #3370ff !important;
background-color: #fff !important;
}
::v-deep .el-icon-more {
.el-icon-more {
border: none !important;
}
}

16
frontend/src/views/chart/chart/table/table-info.js
View File

@ -541,7 +541,7 @@ function mappingColor(value, defaultColor, field, type) {
} else if (i === field.conditions.length - 1) {
color = defaultColor
}
} else if (field.field.deType === 0) {
} else if (field.field.deType === 0 || field.field.deType === 5) {
const tv = t.value
if (t.term === 'eq') {
if (value === tv) {
@ -564,22 +564,12 @@ function mappingColor(value, defaultColor, field, type) {
flag = true
}
} else if (t.term === 'null') {
if (value === null || value === undefined) {
if (value === null || value === undefined || value === '') {
color = t[type]
flag = true
}
} else if (t.term === 'not_null') {
if (value !== null && value !== undefined) {
color = t[type]
flag = true
}
} else if (t.term === 'empty') {
if (value === '') {
color = t[type]
flag = true
}
} else if (t.term === 'not_empty') {
if (value !== '') {
if (value !== null && value !== undefined && value !== '') {
color = t[type]
flag = true
}

10
frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
View File

@ -166,16 +166,6 @@ export default {
value: 'not_null',
label: this.$t('chart.filter_not_null')
}]
},
{
label: '',
options: [{
value: 'empty',
label: this.$t('chart.filter_empty')
}, {
value: 'not_empty',
label: this.$t('chart.filter_not_empty')
}]
}
],
dateOptions: [

1
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -2297,6 +2297,7 @@ export default {
}
}
this.dragMoveDuplicate(this.view.customFilter, e)
this.dragRemoveChartField(this.view.customFilter, e)
this.calcData(true)
},

4
frontend/src/views/panel/LinkJumpSet/index.vue
View File

@ -358,8 +358,8 @@ export default {
methods: {
init() {
const chartDetails = JSON.parse(this.panelViewDetailsInfo[this.viewId])
const checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt
const checkJumpStr = chartDetails.type.includes('table') ? checkAllAxisStr : chartDetails.xaxis + chartDetails.xaxisExt
const checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields
const checkJumpStr = chartDetails.type.includes('table') ? checkAllAxisStr : chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.drillFields
// 获取可关联的仪表板
groupTree({}).then(rsp => {