提交 b8521fd8 authored 作者: taojinlong's avatar taojinlong

Merge branch 'main' of github.com:dataease/dataease into main

......@@ -12,4 +12,5 @@ import lombok.Setter;
public class DataTableInfoDTO {
private String table;
private String sql;
private String data;// file path
}
......@@ -60,6 +60,8 @@ logging.level.org.springframework.web=trace
logging.level.org.springframework.boot.web=trace
spring.mvc.log-request-details=true
pagehelper.PageRowBounds=true
#excel等用户上传文件路径
upload.file.path=/opt/dataease/data/upload/
......
......@@ -95,7 +95,8 @@ export default {
height: 600,
fileList: [],
headers: { Authorization: token },
baseUrl: process.env.VUE_APP_BASE_API
baseUrl: process.env.VUE_APP_BASE_API,
path: ''
}
},
watch: {
......@@ -131,7 +132,7 @@ export default {
// console.log(response)
// console.log(file)
// console.log(fileList)
this.path = response.data.path
this.fields = response.data.fields
this.data = response.data.data
const datas = this.data
......@@ -153,7 +154,7 @@ export default {
dataSourceId: null,
type: 'excel',
mode: parseInt(this.mode),
info: '{"data":"' + '123' + '"}'
info: '{"data":"' + this.path + '"}'
}
post('/dataset/table/update', table).then(response => {
this.$store.dispatch('dataset/setSceneData', new Date().getTime())
......
......@@ -138,9 +138,9 @@
</div>
</el-dialog>
<el-row>
<el-button icon="el-icon-download" size="mini">
{{ $t('dataset.sync_now') }}
</el-button>
<!-- <el-button icon="el-icon-download" size="mini">-->
<!-- {{ $t('dataset.sync_now') }}-->
<!-- </el-button>-->
<el-button icon="el-icon-plus" size="mini" @click="addTask(undefined)">
{{ $t('dataset.add_task') }}
</el-button>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论