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

backend/src/main/java/io/dataease/service/chart/ChartViewService.java

@@ -144,7 +144,6 @@ public class ChartViewService {
             } else if (StringUtils.equalsIgnoreCase(table.getType(), "sql")) {
                 datasourceRequest.setQuery(getSQL(ds.getType(), " (" + dataTableInfoDTO.getSql() + ") AS tmp ", xAxis, yAxis, extFilterList));
             }
-            LogUtil.info(datasourceRequest.getQuery());
             data = datasourceProvider.getData(datasourceRequest);
         } else if (table.getMode() == 1) {// 抽取
             // 获取数据集de字段
@@ -159,7 +158,6 @@ public class ChartViewService {
             String tableName = "ds_" + table.getId().replaceAll("-", "_");
             datasourceRequest.setTable(tableName);
             datasourceRequest.setQuery(getSQL(ds.getType(), tableName, xAxis, yAxis, extFilterList));
-            LogUtil.info(datasourceRequest.getQuery());
             data = datasourceProvider.getData(datasourceRequest);
         }
 

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

@@ -242,7 +242,6 @@ public class DataSetTableService {
 
             String table = dataTableInfoDTO.getTable();
             datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
-            LogUtil.info(datasourceRequest.getQuery());
             try {
                 data.addAll(datasourceProvider.getData(datasourceRequest));
             } catch (Exception e) {
@@ -262,7 +261,6 @@ public class DataSetTableService {
 
             String sql = dataTableInfoDTO.getSql();
             datasourceRequest.setQuery(createQuerySQL(ds.getType(), " (" + sql + ") AS tmp ", fieldArray) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
-            LogUtil.info(datasourceRequest.getQuery());
             try {
                 data.addAll(datasourceProvider.getData(datasourceRequest));
             } catch (Exception e) {
@@ -281,7 +279,6 @@ public class DataSetTableService {
             datasourceRequest.setDatasource(ds);
             String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
             datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
-            LogUtil.info(datasourceRequest.getQuery());
             try {
                 data.addAll(jdbcProvider.getData(datasourceRequest));
             } catch (Exception e) {
@@ -301,7 +298,6 @@ public class DataSetTableService {
             datasourceRequest.setDatasource(ds);
             String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
             datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
-            LogUtil.info(datasourceRequest.getQuery());
             try {
                 data.addAll(jdbcProvider.getData(datasourceRequest));
             } catch (Exception e) {

frontend/src/lang/zh.js

@@ -815,7 +815,9 @@ export default {
     invalid_dataset: 'Kettle未运行，无效数据集',
     check_all: '全选',
     can_not_union_self: '被关联表不能与关联表相同',
-    float: '小数'
+    float: '小数',
+    edit_custom_table: '编辑自助数据集',
+    edit_field: '编辑字段'
   },
   datasource: {
     datasource: '数据源',

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

@@ -2,7 +2,7 @@
   <el-col>
     <el-row style="height: 26px;">
       <span style="line-height: 26px;">
-        {{ $t('dataset.add_custom_table') }}
+        {{ param.tableId?$t('dataset.edit_custom_table'):$t('dataset.add_custom_table') }}
       </span>
       <el-row style="float: right">
         <el-button size="mini" @click="cancel">
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import { post } from '@/api/dataset/dataset'
+import { post, getTable } from '@/api/dataset/dataset'
 import DatasetGroupSelector from '../common/DatasetGroupSelector'
 import DatasetCustomField from '../common/DatasetCustomField'
 
@@ -89,15 +89,7 @@ export default {
   watch: {
     'checkedList': function() {
       // console.log(this.checkedList)
-      if (this.checkedList && this.checkedList.length > 0) {
-        // 根据第一个选择的数据集找到关联视图
-        post('dataset/union/listByTableId/' + this.checkedList[0].tableId, {}).then(response => {
-          // console.log(response)
-          this.unionData = response.data
-        })
-      } else {
-        this.unionData = []
-      }
+      this.getUnionData()
     }
   },
   mounted() {
@@ -105,6 +97,11 @@ export default {
       this.calHeight()
     }
     this.calHeight()
+
+    if (this.param && this.param.id && this.param.tableId) {
+      this.getCustomTable()
+      this.getUnionData()
+    }
   },
   methods: {
     calHeight() {
@@ -144,6 +141,9 @@ export default {
         }
       }
       // console.log(this.checkedList)
+      this.getData()
+    },
+    getData() {
       // request to get data
       if (this.checkedList.length > 0) {
         const table = {
@@ -169,6 +169,17 @@ export default {
         this.$refs.plxTable.reloadData(datas)
       }
     },
+    getUnionData() {
+      if (this.checkedList && this.checkedList.length > 0) {
+        // 根据第一个选择的数据集找到关联视图
+        post('dataset/union/listByTableId/' + this.checkedList[0].tableId, {}).then(response => {
+          // console.log(response)
+          this.unionData = response.data
+        })
+      } else {
+        this.unionData = []
+      }
+    },
     save() {
       const table = {
         id: this.param.tableId,
@@ -185,6 +196,22 @@ export default {
       })
     },
 
+    getCustomTable() {
+      getTable(this.param.tableId).then(response => {
+        const table = response.data
+        this.name = table.name
+        this.checkedList = JSON.parse(table.info).list
+
+        this.getCheckTable(this.checkedList[0].tableId)
+        this.getData()
+      })
+    },
+    getCheckTable(tableId) {
+      getTable(tableId).then(response => {
+        this.table = response.data
+      })
+    },
+
     cancel() {
       this.dataReset()
       this.$emit('switchComponent', { name: '' })

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

@@ -28,8 +28,8 @@
         </el-form-item>
         <el-form-item class="form-item">
           <el-select v-model="mode" filterable :placeholder="$t('dataset.connect_mode')" size="mini">
-            <el-option :label="$t('dataset.direct_connect')" value="0"  />
-            <el-option :label="$t('dataset.sync_data')" value="1" :disabled="!kettleRunning"/>
+            <el-option :label="$t('dataset.direct_connect')" value="0" />
+            <el-option :label="$t('dataset.sync_data')" value="1" :disabled="!kettleRunning" />
           </el-select>
         </el-form-item>
         <el-form-item class="form-item" style="float: right;">
@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import {listDatasource, post, isKettleRunning} from '@/api/dataset/dataset'
+import { listDatasource, post, isKettleRunning } from '@/api/dataset/dataset'
 
 export default {
   name: 'AddDB',
@@ -103,7 +103,7 @@ export default {
   activated() {
     this.initDataSource()
   },
-  created(){
+  created() {
     this.kettleState()
   },
   methods: {
@@ -112,7 +112,7 @@ export default {
         this.options = response.data
       })
     },
-    kettleState(){
+    kettleState() {
       isKettleRunning().then(res => {
         this.kettleRunning = res.data
       })

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

@@ -28,7 +28,7 @@
                   :multiple="false"
                   :show-file-list="false"
                   :file-list="fileList"
-                  accept=".xls,.xlsx,.csv"
+                  accept=".xls,.xlsx,"
                   :before-upload="beforeUpload"
                   :on-success="uploadSuccess"
                   :on-error="uploadFail"

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

@@ -88,7 +88,7 @@
 </template>
 
 <script>
-import {post, listDatasource, isKettleRunning} from '@/api/dataset/dataset'
+import { post, listDatasource, isKettleRunning } from '@/api/dataset/dataset'
 import { codemirror } from 'vue-codemirror'
 import { getTable } from '@/api/dataset/dataset'
 // 核心样式
@@ -171,11 +171,11 @@ export default {
 
     this.initTableInfo()
   },
-  created(){
+  created() {
     this.kettleState()
   },
   methods: {
-    kettleState(){
+    kettleState() {
       isKettleRunning().then(res => {
         this.kettleRunning = res.data
       })

frontend/src/views/dataset/common/DatasetGroupSelector.vue

@@ -103,7 +103,7 @@
 </template>
 
 <script>
-import {isKettleRunning, post} from '@/api/dataset/dataset'
+import { isKettleRunning, post } from '@/api/dataset/dataset'
 
 export default {
   name: 'DatasetGroupSelector',
@@ -169,11 +169,11 @@ export default {
     this.tree(this.groupForm)
     this.tableTree()
   },
-  created(){
+  created() {
     this.kettleState()
   },
   methods: {
-    kettleState(){
+    kettleState() {
       isKettleRunning().then(res => {
         this.kettleRunning = res.data
       })
@@ -213,8 +213,8 @@ export default {
         }).then(response => {
           this.tables = response.data
           for (let i = 0; i < this.tables.length; i++) {
-            if(this.tables[i].mode===1 && this.kettleRunning === false){
-              this.$set(this.tables[i],"disabled",true)
+            if (this.tables[i].mode === 1 && this.kettleRunning === false) {
+              this.$set(this.tables[i], 'disabled', true)
             }
           }
           this.tableData = JSON.parse(JSON.stringify(this.tables))
@@ -248,7 +248,7 @@ export default {
     },
 
     sceneClick(data, node) {
-      if(data.disabled){
+      if (data.disabled) {
         this.$message({
           type: 'warning',
           message: this.$t('dataset.invalid_dataset'),

frontend/src/views/dataset/data/ViewTable.vue

@@ -14,11 +14,14 @@
         </span>
       </el-popover>
       <el-row style="float: right">
+        <el-button v-if="table.type ==='custom'" size="mini" @click="editCustom">
+          {{ $t('dataset.edit_custom_table') }}
+        </el-button>
         <el-button v-if="table.type ==='sql'" size="mini" @click="editSql">
           {{ $t('dataset.edit_sql') }}
         </el-button>
         <el-button size="mini" @click="edit">
-          {{ $t('dataset.edit') }}
+          {{ $t('dataset.edit_field') }}
         </el-button>
         <!--        <el-button size="mini" type="primary" @click="createChart">-->
         <!--          {{$t('dataset.create_view')}}-->
@@ -116,6 +119,9 @@ export default {
     editSql() {
       this.$emit('switchComponent', { name: 'AddSQL', param: { id: this.table.sceneId, tableId: this.table.id }})
     },
+    editCustom() {
+      this.$emit('switchComponent', { name: 'AddCustom', param: { id: this.table.sceneId, tableId: this.table.id }})
+    },
 
     reSearch(val) {
       this.tableViewRowForm = val.form

frontend/src/views/dataset/group/Group.vue

@@ -242,7 +242,7 @@
 </template>
 
 <script>
-import { loadTable, getScene, addGroup, delGroup, addTable, delTable, groupTree, isKettleRunning} from '@/api/dataset/dataset'
+import { loadTable, getScene, addGroup, delGroup, addTable, delTable, groupTree, isKettleRunning } from '@/api/dataset/dataset'
 
 export default {
   name: 'Group',
@@ -546,7 +546,7 @@ export default {
     },
 
     addData(name) {
-      this.$emit('switchComponent', { name: name, param: this.currGroup})
+      this.$emit('switchComponent', { name: name, param: this.currGroup })
     },
 
     sceneClick(data, node) {