Merge branch 'dev' into v1.18

backend/src/main/java/io/dataease/service/datasource/DatasourceService.java

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

backend/src/main/resources/sql/sqlTemplate.stg

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

frontend/src/styles/index.scss

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

frontend/src/views/system/relationship/index.vue

@@ -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 {
   max-height: 70%;
   overflow-y: scroll;