diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisConstants.java b/backend/src/main/java/io/dataease/provider/doris/DorisConstants.java index c27e4dcf88..5930960165 100644 --- a/backend/src/main/java/io/dataease/provider/doris/DorisConstants.java +++ b/backend/src/main/java/io/dataease/provider/doris/DorisConstants.java @@ -24,7 +24,7 @@ public class DorisConstants extends SQLConstants { public static final String DEFAULT_DATE_FORMAT = "%Y-%m-%d %H:%i:%S"; - public static final String DEFAULT_INT_FORMAT = "DECIMAL(20,0)"; + public static final String DEFAULT_INT_FORMAT = "BIGINT"; public static final String DEFAULT_FLOAT_FORMAT = "DECIMAL(20,2)"; diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue index 10c5fd883a..053e55657b 100644 --- a/frontend/src/views/dataset/add/AddCustom.vue +++ b/frontend/src/views/dataset/add/AddCustom.vue @@ -233,7 +233,7 @@ export default { cancel() { // this.dataReset() if (this.param.tableId) { - this.$emit('switchComponent', { name: 'ViewTable', param: this.param.tableId }) + this.$emit('switchComponent', { name: 'ViewTable', param: { id: this.param.tableId }}) } else { this.$emit('switchComponent', { name: '' }) } diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue index a447221c59..6a53b3275f 100644 --- a/frontend/src/views/dataset/add/AddExcel.vue +++ b/frontend/src/views/dataset/add/AddExcel.vue @@ -232,7 +232,11 @@ export default { cancel() { this.dataReset() // this.$router.push('/dataset/home') - this.$emit('switchComponent', { name: '' }) + if (this.param.tableId) { + this.$emit('switchComponent', { name: 'ViewTable', param: { id: this.param.tableId }}) + } else { + this.$emit('switchComponent', { name: '' }) + } }, dataReset() { diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue index 8973464a27..6315217ec4 100644 --- a/frontend/src/views/dataset/add/AddSQL.vue +++ b/frontend/src/views/dataset/add/AddSQL.vue @@ -37,7 +37,7 @@ - + @@ -283,7 +283,7 @@ export default { cancel() { // this.dataReset() if (this.param.tableId) { - this.$emit('switchComponent', { name: 'ViewTable', param: this.param.tableId }) + this.$emit('switchComponent', { name: 'ViewTable', param: { id: this.param.tableId }}) } else { this.$emit('switchComponent', { name: '' }) }