diff --git a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java index a943170556..95b7b039a3 100644 --- a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java @@ -1215,7 +1215,8 @@ public class OracleQueryProvider extends QueryProvider { whereName = String.format(OracleConstants.FROM_UNIXTIME, cast, format); } if (field.getDeExtractType() == 1) { - whereName = String.format(OracleConstants.TO_CHAR, format); + whereName = originName; +// whereName = String.format(OracleConstants.TO_CHAR, originName, format); } } else if (field.getDeType() == 2 || field.getDeType() == 3) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue index f4f5e244b9..86dfaba760 100644 --- a/frontend/src/components/canvas/customComponent/UserView.vue +++ b/frontend/src/components/canvas/customComponent/UserView.vue @@ -141,10 +141,10 @@ style="position: absolute;right: 70px;top:15px" > {{ $t('chart.export_img') }} @@ -152,7 +152,7 @@ { + this.dialogLoading = false + }) }, exportViewImg() { this.imageDownloading = true diff --git a/frontend/src/components/canvas/customComponent/UserViewDialog.vue b/frontend/src/components/canvas/customComponent/UserViewDialog.vue index 9dfeda1a2a..db5ab9106b 100644 --- a/frontend/src/components/canvas/customComponent/UserViewDialog.vue +++ b/frontend/src/components/canvas/customComponent/UserViewDialog.vue @@ -1,6 +1,6 @@