github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 【数据集】带系统变量的SQL节点，保存时提示成功，但关闭窗口提示未保存

Browse Source
This commit is contained in:
taojinlong 2024-12-31 15:36:29 +08:00 committed by dataeaseShu
parent 21dc31da55
commit 63b0adea19
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
View File

@ -45,9 +45,9 @@ public class SqlparserUtils {
private static final String SubstitutedParams = "DATAEASE_PATAMS_BI";
private static final String SysParamsSubstitutedParams = "DeSysParams_";
private static final String SubstitutedSql = " 'DE-BI' = 'DE-BI' ";
private ExpressionDeParser expressionDeParser;
private boolean removeSysParams;
private UserFormVO userEntity;
private final List<Map<String, String>> sysParams = new ArrayList<>();
public String handleVariableDefaultValue(String sql, String sqlVariableDetails, boolean isEdit, boolean isFromDataSet, List<SqlVariableDetails> parameters, boolean isCross, Map<Long, DatasourceSchemaDTO> dsMap, PluginManageApi pluginManage, UserFormVO userEntity) {
if (StringUtils.isEmpty(sql)) {
@ -105,7 +105,7 @@ public class SqlparserUtils {
try {
DatasourceSchemaDTO ds = dsMap.entrySet().iterator().next().getValue();
this.removeSysParams = false;
sql = removeVariables(sql, "mysql");
sql = removeVariables(sql, ds.getType());
// replace keyword '`'
if (!isCross) {
Map.Entry<Long, DatasourceSchemaDTO> next = dsMap.entrySet().iterator().next();
@ -140,7 +140,7 @@ public class SqlparserUtils {
}
}
this.removeSysParams = true;
sql = removeVariables(sql, "mysql");
sql = removeVariables(sql, ds.getType());
} catch (Exception e) {
e.printStackTrace();
}
@ -158,6 +158,9 @@ public class SqlparserUtils {
tmpSql = tmpSql.replace(matcher.group(), SubstitutedParams);
}
if (removeSysParams) {
for (Map<String, String> sysParam : sysParams) {
tmpSql = tmpSql.replaceAll(sysParam.get("replace"), sysParam.get("origin"));
}
pattern = Pattern.compile(regex2);
matcher = pattern.matcher(tmpSql);
while (matcher.find()) {
@ -167,9 +170,14 @@ public class SqlparserUtils {
} else {
pattern = Pattern.compile(regex2);
matcher = pattern.matcher(tmpSql);
sysParams.clear();
while (matcher.find()) {
hasVariables = true;
tmpSql = tmpSql.replace(matcher.group(), SysParamsSubstitutedParams + matcher.group().substring(1, matcher.group().length() - 1));
Map<String, String> sysParam = new HashMap<>();
sysParam.put("origin", matcher.group());
sysParam.put("replace", SysParamsSubstitutedParams + matcher.group().substring(1, matcher.group().length() - 1));
sysParams.add(sysParam);
}
}
Statement statement = CCJSqlParserUtil.parse(tmpSql);
@ -560,7 +568,6 @@ public class SqlparserUtils {
}
}
};
this.expressionDeParser = expressionDeParser;
return expressionDeParser;
}

10
core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
View File

@ -315,7 +315,7 @@ watch(
() => {
state.variables = sqlNode.value.variables
if (codeCom.value) {
insertParamToCodeMirror(Base64.decode(sqlNode.value.sql))
insertParamToCodeMirror(setNameIdTrans('id', 'name', Base64.decode(sqlNode.value.sql)))
}
},
{
@ -347,8 +347,7 @@ const save = (cb?: () => void) => {
}
parseVariable()
sql = codeCom.value.state.doc.toString()
sql = setNameIdTrans('name', 'id', sql)
sql = setNameIdTrans('name', 'id', codeCom.value.state.doc.toString())
sqlNode.value.changeFlag = true
if (!sql.trim()) {
ElMessage.error(t('data_set.cannot_be_empty_de'))
@ -373,14 +372,13 @@ const close = () => {
state.plxTableData = []
state.fields = []
if (codeCom.value) {
insertParamToCodeMirror(Base64.decode(sqlNode.value.sql))
insertParamToCodeMirror(setNameIdTrans('id', 'name', Base64.decode(sqlNode.value.sql)))
}
emits('close')
}
const handleClose = () => {
let sqlNew = codeCom.value.state.doc.toString()
sqlNew = setNameIdTrans('name', 'id', sqlNew)
let sqlNew = setNameIdTrans('name', 'id', codeCom.value.state.doc.toString())
if (changeFlag || sql !== sqlNew || !sqlNew.trim()) {
ElMessageBox.confirm(t('chart.tips'), {
confirmButtonType: 'primary',