public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 13:32:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 编辑sql时，默认值不生效

Browse Source
This commit is contained in:
taojinlong
2025-06-09 14:41:17 +08:00
committed by taojinlong
parent b637725097
commit 2555f0b057
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
View File

@@ -139,7 +139,7 @@ public class DatasetDataManage {
} else {
// parser sql params and replace default value
String s = new String(Base64.getDecoder().decode(tableInfoDTO.getSql()));
String originSql = new SqlparserUtils().handleVariableDefaultValue(s, datasetTableDTO.getSqlVariableDetails(), false, false, null, datasourceRequest.getIsCross(), datasourceRequest.getDsList(), pluginManage, getUserEntity());
String originSql = new SqlparserUtils().handleVariableDefaultValue(s, datasetTableDTO.getSqlVariableDetails(), true, false, null, datasourceRequest.getIsCross(), datasourceRequest.getDsList(), pluginManage, getUserEntity());
originSql = provider.replaceComment(originSql);
// add sql table schema

5
core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
View File

@@ -269,14 +269,15 @@ const closeSqlNode = () => {
changeSqlId.value.length === 1
) {
currentNode.value = state.nodeList[0]
const { datasourceId, id, info, tableName } = currentNode.value
const { datasourceId, id, info, tableName, sqlVariableDetails } = currentNode.value
getTableField({
datasourceId,
id,
info,
tableName,
type: 'sql',
isCross: isCross.value
isCross: isCross.value,
sqlVariableDetails: sqlVariableDetails
}).then(res => {
const idOriginNameMap = allfields.value.reduce((pre, next) => {
pre[`${next.datasetTableId}${next.originName}`] = next.id