fix: 数据源详情,数据集预览

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -1111,6 +1111,7 @@ public class DataSetTableService {
         QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
         String sqlAsTable = qp.createSQLPreview(sql, null);
         datasourceRequest.setQuery(sqlAsTable);
+        datasourceRequest.setTable(dataTableInfo.getTable());
         Map<String, List> result = datasourceProvider.fetchResultAndField(datasourceRequest);
         List<String[]> data = result.get("dataList");
         List<TableField> fields = result.get("fieldList");

frontend/src/views/dataset/add/AddApi.vue

@@ -155,7 +155,7 @@
 
 <script>
 import { listApiDatasource, post, isKettleRunning } from '@/api/dataset/dataset'
-import { engineMode } from '@/api/system/engine'
+import {dbPreview, engineMode} from '@/api/system/engine'
 
 export default {
   name: 'AddApi',
@@ -554,4 +554,4 @@ export default {
     transform: rotate(45deg);
   }
 }
-</style>
+</style>

frontend/src/views/dataset/add/AddExcel.vue

@@ -1,11 +1,5 @@
 <template>
   <div class="dataset-excel">
-    <!-- <el-button size="mini" @click="cancel">
-            {{ $t('dataset.cancel') }}
-          </el-button>
-          <el-button size="mini" type="primary" @click="save">
-            {{ $t('dataset.confirm') }}
-          </el-button> -->
     <p v-if="!showLeft" @click="showLeft = true" class="arrow-right">
       <i class="el-icon-d-arrow-right"></i>
     </p>
@@ -29,7 +23,7 @@
         :show-file-list="false"
         :file-list="fileList"
         :data="param"
-        accept=".xls,.xlsx,"
+        accept=".xls,.xlsx,csv"
         :before-upload="beforeUpload"
         :on-success="uploadSuccess"
         :on-error="uploadFail"

frontend/src/views/system/datasource/dsTable.vue

@@ -88,15 +88,15 @@
     stripe
     style="width: 100%">
     <el-table-column
-      prop="date"
+      prop="fieldName"
       :label="$t('panel.column_name')">
     </el-table-column>
     <el-table-column
-      prop="name"
+      prop="fieldType"
       :label="$t('dataset.field_type')">
     </el-table-column>
     <el-table-column
-      prop="name"
+      prop="remarks"
       :label="$t('datasource.field_description')">
     </el-table-column>
   </el-table>
@@ -107,7 +107,7 @@
 <script>
 import keyEnter from "@/components/msgCfm/keyEnter.js";
 import GridTable from "@/components/gridTable/index.vue";
-import { dsTable } from "@/api/dataset/dataset";
+import {dsTable, post} from "@/api/dataset/dataset";
 export default {
   mixins: [keyEnter],
   components: { GridTable },
@@ -133,13 +133,20 @@ export default {
     };
   },
   created() {
-    // this.initSearch();
+    post('/datasource/getTables/' + this.params.id, {}).then((response) => {
+      this.tableData = response.data
+    })
   },
   methods: {
     createtDataset(row) {},
     selectDataset(row) {
       this.dsTableDetail = row;
       this.userDrawer = true;
+      var table = {dataSourceId: this.params.id}
+      table.info = JSON.stringify({table: row.name})
+      post('/dataset/table/getFields', table).then((response) => {
+        this.dsTableData = response.data
+      })
     },
     handleSizeChange(pageSize) {
       this.paginationConfig.currentPage = 1;