Merge remote-tracking branch 'origin/release/10.0' into release/10.0

designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java

@@ -109,10 +109,9 @@ public class TableViewList extends UIList {
                 String[] schemas = DataCoreUtils.getDatabaseSchema(datasource);
                 schemas = (schemas == null || schemas.length == 0) ? new String[]{null} : schemas;
                 for (String schema : schemas) {
-                    DataCoreUtils.refreshTables(datasource, TableProcedure.TABLE, schema);
+                    clearCache(datasource, schema);
-                    DataCoreUtils.refreshTables(datasource, TableProcedure.VIEW, schema);
-                    DataCoreUtils.refreshTables(datasource, TableProcedure.PROCEDURE, schema);
                 }
+                clearCache(datasource, null);
                 return processDataInAnotherThread(databaseName, searchFilter, typesFilter);
             }
 
@@ -133,6 +132,12 @@ public class TableViewList extends UIList {
         }
     }
 
+    private void clearCache(Connection datasource, String schema) {
+        DataCoreUtils.refreshTables(datasource, TableProcedure.TABLE, schema);
+        DataCoreUtils.refreshTables(datasource, TableProcedure.VIEW, schema);
+        DataCoreUtils.refreshTables(datasource, TableProcedure.PROCEDURE, schema);
+    }
+
     /**
      * august：databaseName是数据库名字，searchFilter是输入的过滤条件,typesFilter是视图、表、
      * 存储过程中的一者或者几者

designer-base/src/main/java/com/fr/design/ui/Assistant.java

@@ -59,7 +59,8 @@ public class Assistant {
         if (path.endsWith(".svg")) {
             return "image/svg+xml";
         }
-        if (path.endsWith(".png")) {
+        // upm 文件夹中的图片如果返回 Content-type 为 image/png 时会显示异常
+        if (path.endsWith(".png") && !path.contains("/upm")) {
             return "image/png";
         }
         if (path.endsWith(".woff")) {