github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

refactor: 代码调整

Browse Source
This commit is contained in:
junjie 2021-02-25 10:42:48 +08:00
parent dcc522dc05
commit 9085de668f
8 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -102,7 +102,14 @@ public class DataSetTableService {
DatasourceRequest datasourceRequest = new DatasourceRequest(); DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(ds); datasourceRequest.setDatasource(ds);
String table = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class).getTable(); String table = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class).getTable();
datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, new String[]{"*"}));
DatasetTableField datasetTableField = new DatasetTableField();
datasetTableField.setTableId(dataSetTableRequest.getId());
datasetTableField.setChecked(Boolean.TRUE);
List<DatasetTableField> fields = dataSetTableFieldsService.list(datasetTableField);
String[] fieldArray = fields.stream().map(DatasetTableField::getOriginName).toArray(String[]::new);
datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray));
return datasourceProvider.getData(datasourceRequest); return datasourceProvider.getData(datasourceRequest);
} }

0
frontend/src/business/components/dataset/data/AddDB.vue → frontend/src/business/components/dataset/add/AddDB.vue
View File

3
frontend/src/business/components/dataset/data/ViewTable.vue
View File

@ -21,6 +21,9 @@
<el-tab-pane :label="$t('dataset.data_preview')" name="dataPreview"> <el-tab-pane :label="$t('dataset.data_preview')" name="dataPreview">
<tab-data-preview :table="table" :fields="fields" :data="data"/> <tab-data-preview :table="table" :fields="fields" :data="data"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('dataset.join_view')" name="joinView">
关联视图 TODO
</el-tab-pane>
<el-tab-pane :label="$t('dataset.update_info')" name="updateInfo"> <el-tab-pane :label="$t('dataset.update_info')" name="updateInfo">
更新信息 TODO 更新信息 TODO
</el-tab-pane> </el-tab-pane>

3
frontend/src/business/components/dataset/router.js
View File

@ -1,7 +1,8 @@
const DataSet = () => import('@/business/components/dataset/DataSet'); const DataSet = () => import('@/business/components/dataset/DataSet');
const DataSetHome = () => import('@/business/components/dataset/data/DataHome'); const DataSetHome = () => import('@/business/components/dataset/data/DataHome');
const DataSetAddDB = () => import('@/business/components/dataset/data/AddDB');
const DataSetTable = () => import('@/business/components/dataset/data/ViewTable'); const DataSetTable = () => import('@/business/components/dataset/data/ViewTable');
const DataSetAddDB = () => import('@/business/components/dataset/add/AddDB');
// const PerformanceTestHome = () => import('@/business/components/performance/home/PerformanceTestHome') // const PerformanceTestHome = () => import('@/business/components/performance/home/PerformanceTestHome')
// const EditPerformanceTest = () => import('@/business/components/performance/test/EditPerformanceTest') // const EditPerformanceTest = () => import('@/business/components/performance/test/EditPerformanceTest')
// const PerformanceTestList = () => import('@/business/components/performance/test/PerformanceTestList') // const PerformanceTestList = () => import('@/business/components/performance/test/PerformanceTestList')

3
frontend/src/i18n/en-US.js
View File

@ -1554,6 +1554,7 @@ export default {
field_name:'Field Name', field_name:'Field Name',
field_origin_name:'Origin Name', field_origin_name:'Origin Name',
field_check:'Checked', field_check:'Checked',
update_info:'Update Info' update_info:'Update Info',
join_view: 'Relation View'
} }
}; };

3
frontend/src/i18n/zh-CN.js
View File

@ -1565,7 +1565,8 @@ export default {
field_name: '字段名', field_name: '字段名',
field_origin_name: '原始名', field_origin_name: '原始名',
field_check: '选中', field_check: '选中',
update_info:'更新信息' update_info: '更新信息',
join_view: '关联视图'
}, },
datasource: { datasource: {
create: '新建数据连接', create: '新建数据连接',

3
frontend/src/i18n/zh-TW.js
View File

@ -1555,6 +1555,7 @@ export default {
field_name:'字段名', field_name:'字段名',
field_origin_name:'原始名', field_origin_name:'原始名',
field_check:'選中', field_check:'選中',
update_info:'更新信息' update_info:'更新信息',
join_view: '關聯視圖'
} }
}; };