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

Merge pull request #12375 from dataease/dev-v2

Browse Source 
merge v2.10.1
This commit is contained in:
fit2cloudrd 2024-09-23 14:01:54 +08:00 committed by GitHub
commit 51d201f084
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 62 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
core/core-frontend/src/store/modules/data-visualization/dvMain.ts
View File

@ -731,7 +731,50 @@ export const dvMainStore = defineStore('dataVisualization', {
// 修改对应图表的参数
this.curBatchOptComponents.forEach(viewId => {
const viewInfo = this.canvasViewInfo[viewId]
if (propertyInfo.subProp) {
//针对双轴图chart-mix
if (
viewInfo.type.includes('chart-mix') &&
propertyInfo.property === 'basicStyle' &&
propertyInfo.subProp
) {
const subValue = get(propertyInfo.value, propertyInfo.subProp)
const target = viewInfo[propertyInfo.custom][propertyInfo.property]
set(target, propertyInfo.subProp, subValue)
switch (propertyInfo.subProp) {
case 'alpha':
const subAlpha = get(propertyInfo.value, 'subAlpha')
set(target, 'subAlpha', subAlpha)
break
case 'colorScheme':
const subColorScheme = get(propertyInfo.value, 'subColorScheme')
set(target, 'subColorScheme', subColorScheme)
break
case 'seriesColor':
const subSeriesColor = get(propertyInfo.value, 'subSeriesColor')
set(target, 'subSeriesColor', subSeriesColor)
break
case 'colors':
const subColors = get(propertyInfo.value, 'subColors')
set(target, 'subColors', subColors)
break
case 'lineWidth':
const leftLineWidth = get(propertyInfo.value, 'leftLineWidth')
set(target, 'leftLineWidth', leftLineWidth)
break
case 'lineSymbol':
const leftLineSymbol = get(propertyInfo.value, 'leftLineSymbol')
set(target, 'leftLineSymbol', leftLineSymbol)
break
case 'lineSymbolSize':
const leftLineSymbolSize = get(propertyInfo.value, 'leftLineSymbolSize')
set(target, 'leftLineSymbolSize', leftLineSymbolSize)
break
case 'lineSmooth':
const leftLineSmooth = get(propertyInfo.value, 'leftLineSmooth')
set(target, 'leftLineSmooth', leftLineSmooth)
break
}
} else if (propertyInfo.subProp) {
const subValue = get(propertyInfo.value, propertyInfo.subProp)
const target = viewInfo[propertyInfo.custom][propertyInfo.property]
set(target, propertyInfo.subProp, subValue)

4
core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue
View File

@ -17,6 +17,7 @@
@onTooltipChange="onTooltipChange"
@onChangeXAxisForm="onChangeXAxisForm"
@onChangeYAxisForm="onChangeYAxisForm"
@onChangeYAxisExtForm="onChangeYAxisExtForm"
@onTextChange="onTextChange"
@onLegendChange="onLegendChange"
@onBackgroundChange="onBackgroundChange"
@ -87,6 +88,9 @@ const onChangeXAxisForm = (val, prop) => {
const onChangeYAxisForm = (val, prop) => {
batchOptChange('customStyle', 'yAxis', val, prop)
}
const onChangeYAxisExtForm = (val, prop) => {
batchOptChange('customStyle', 'yAxisExt', val, prop)
}
const onIndicatorChange = (val, prop) => {
batchOptChange('customAttr', 'indicator', val.indicatorValue, prop)

2
pom.xml
View File

@ -30,7 +30,7 @@
<mybatis-plus.version>3.5.6</mybatis-plus.version>
<h2.version>2.2.220</h2.version>
<knife4j.version>4.4.0</knife4j.version>
<calcite-core.version>1.35.13</calcite-core.version>
<calcite-core.version>1.35.14</calcite-core.version>
<commons-dbcp2.version>2.6.0</commons-dbcp2.version>
<antlr.version>3.5.2</antlr.version>
<java-jwt.version>3.12.1</java-jwt.version>

14
sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceDTO.java
View File

@ -14,10 +14,10 @@ public class DatasourceDTO implements Serializable {
@Serial
private static final long serialVersionUID = 1175287571828910222L;
@JsonSerialize(using= ToStringSerializer.class)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
@JsonSerialize(using= ToStringSerializer.class)
@JsonSerialize(using = ToStringSerializer.class)
private Long pid;
/**
* 数据源名称
@ -73,10 +73,10 @@ public class DatasourceDTO implements Serializable {
private TaskDTO syncSetting;
private Integer editType;
private String nodeType;
private String action;
private String fileName;
private String size;
private String nodeType;
private String action;
private String fileName;
private String size;
/**
* 上次成功更新时间
*/
@ -91,4 +91,6 @@ public class DatasourceDTO implements Serializable {
private String taskStatus;
private Boolean enableDataFill;
private int dsVersion = -1;
}

6
sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/Provider.java
View File

@ -136,6 +136,10 @@ public abstract class Provider {
try {
DatasourceSchemaDTO value = dsMap.entrySet().iterator().next().getValue();
// 获取数据库version
ConnectionObj connection = getConnection(value);
value.setDsVersion(connection.getConnection().getMetaData().getDatabaseMajorVersion());
SqlParser parser = SqlParser.create(sql, SqlParser.Config.DEFAULT.withLex(Lex.JAVA));
SqlNode sqlNode = parser.parseStmt();
return sqlNode.toSqlString(getDialect(value)).toString();
@ -218,7 +222,7 @@ public abstract class Provider {
sqlDialect = RedshiftSqlDialect.DEFAULT;
break;
case ck:
sqlDialect = ClickHouseSqlDialect.DEFAULT;
sqlDialect = new ClickHouseSqlDialect(ClickHouseSqlDialect.DEFAULT_CONTEXT, coreDatasource.getDsVersion());
break;
case h2:
sqlDialect = H2SqlDialect.DEFAULT;