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

Merge branch 'dev' into v1.18

Browse Source
This commit is contained in:
taojinlong 2023-02-27 13:58:32 +08:00
commit 0047493dfc
4 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
View File

@ -650,6 +650,9 @@ public class DatasourceService {
public void updateDemoDs() { public void updateDemoDs() {
Datasource datasource = datasourceMapper.selectByPrimaryKey("76026997-94f9-4a35-96ca-151084638969"); Datasource datasource = datasourceMapper.selectByPrimaryKey("76026997-94f9-4a35-96ca-151084638969");
if(datasource == null){
return;
}
MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfiguration.class); MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfiguration.class);
Pattern WITH_SQL_FRAGMENT = Pattern.compile("jdbc:mysql://(.*):(\\d+)/(.*)"); Pattern WITH_SQL_FRAGMENT = Pattern.compile("jdbc:mysql://(.*):(\\d+)/(.*)");
Matcher matcher = WITH_SQL_FRAGMENT.matcher(env.getProperty("spring.datasource.url")); Matcher matcher = WITH_SQL_FRAGMENT.matcher(env.getProperty("spring.datasource.url"));

4
backend/src/main/resources/sql/sqlTemplate.stg
View File

@ -63,11 +63,11 @@ FROM
WHERE WHERE
<filters:{filter|<if(filter)><filter><endif>}; separator="\nAND "> <filters:{filter|<if(filter)><filter><endif>}; separator="\nAND ">
<endif> <endif>
<if(groups && !useAliasForGroup)> <if(isGroup && groups && !useAliasForGroup)>
GROUP BY GROUP BY
<groups:{group|<if(group)><group.fieldName><endif>}; separator=",\n"> <groups:{group|<if(group)><group.fieldName><endif>}; separator=",\n">
<endif> <endif>
<if(groups && useAliasForGroup)> <if(isGroup && groups && useAliasForGroup)>
GROUP BY GROUP BY
<groups:{group|<if(group)><group.fieldAlias><endif>}; separator=",\n"> <groups:{group|<if(group)><group.fieldAlias><endif>}; separator=",\n">
<endif> <endif>

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

@ -1760,10 +1760,4 @@ div:focus {
.el-table__fixed-right::before { .el-table__fixed-right::before {
display: none; display: none;
}
.auth-tab {
.custom-tree-node {
padding-right: 0 !important;
}
} }

27
frontend/src/views/system/relationship/index.vue
View File

@ -609,33 +609,6 @@ export default {
} }
} }
} }
.custom-tree-node {
flex: 1;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
padding-right: 8px;
}
.custom-tree-node-list {
flex: 1;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
padding: 0 8px;
}
.father .child {
/*display: none;*/
visibility: hidden;
}
.father:hover .child {
/*display: inline;*/
visibility: visible;
}
.relation-popover { .relation-popover {
max-height: 70%; max-height: 70%;
overflow-y: scroll; overflow-y: scroll;