diff --git a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index d69165c1c8..8c363c9a22 100644 --- a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -371,9 +371,11 @@ public class DatasourceService { String datasourceStatus = null; try { Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType()); + System.out.println(datasourceProvider.getClass()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(datasource); datasourceStatus = datasourceProvider.checkStatus(datasourceRequest); + System.out.println(datasourceStatus); if (datasource.getType().equalsIgnoreCase("api")) { List apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken>() { }.getType()); @@ -398,6 +400,7 @@ public class DatasourceService { return ResultHolder.success("Success"); } catch (Exception e) { + e.printStackTrace(); datasourceStatus = "Error"; return ResultHolder.error(Translator.get("I18N_DS_INVALID") + ": " + e.getMessage()); } finally { @@ -405,6 +408,7 @@ public class DatasourceService { record.setStatus(datasourceStatus); DatasourceExample example = new DatasourceExample(); example.createCriteria().andIdEqualTo(datasource.getId()); + System.out.println(new Gson().toJson(record)); datasourceMapper.updateByExampleSelective(record, example); } } diff --git a/core/frontend/src/App.vue b/core/frontend/src/App.vue index 40f3077521..cd8ee87b6b 100644 --- a/core/frontend/src/App.vue +++ b/core/frontend/src/App.vue @@ -13,7 +13,7 @@ :title="$t('user.change_password')" :show-close="false" > - + diff --git a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue index 8ae431370f..dc72d49103 100644 --- a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue +++ b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue @@ -392,7 +392,6 @@ export default { position: absolute; top: 0; left: 0; - z-index: 2; width: 100% !important; height: 100% !important; } diff --git a/core/frontend/src/components/canvas/components/editor/EditBar.vue b/core/frontend/src/components/canvas/components/editor/EditBar.vue index 36d3f127f6..0514c0162e 100644 --- a/core/frontend/src/components/canvas/components/editor/EditBar.vue +++ b/core/frontend/src/components/canvas/components/editor/EditBar.vue @@ -145,7 +145,7 @@ :target="curComponent.hyperlinks.openMode " :href="curComponent.hyperlinks.content " > - + @@ -193,7 +193,7 @@