center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

refactor: 代码调整

Browse Source
This commit is contained in:
junjie 2021-02-25 09:59:18 +08:00
parent 2478683b61
commit dcc522dc05
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ public class DataSetTableService {
String[] fieldArray = fields.stream().map(DatasetTableField::getOriginName).toArray(String[]::new);
// datasourceRequest.setQuery("SELECT " + StringUtils.join(fieldArray, ",") + " FROM " + table + " LIMIT 0,10;");
datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT 0,10;");
datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT 0,10");
List<String[]> data = new ArrayList<>();
try {

4
backend/src/main/resources/db/migration/V9__dataset_tables.sql
View File

@ -22,8 +22,8 @@ CREATE TABLE IF NOT EXISTS `dataset_table_field`
`checked` tinyint(1) NOT NULL DEFAULT true COMMENT '是否选中',
`column_index` int(10) NOT NULL COMMENT '列位置',
`last_sync_time` bigint(13) COMMENT '同步时间',
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `IDX_TABLE_ID` (`table_id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4;
ALTER TABLE `dataset_table_field` ADD INDEX IDX_TABLE_ID (`table_id`);

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

@ -21,15 +21,15 @@
<el-tab-pane :label="$t('dataset.data_preview')" name="dataPreview">
<tab-data-preview :table="table" :fields="fields" :data="data"/>
</el-tab-pane>
<el-tab-pane label="更新信息" name="updateInfo">
更新信息
<el-tab-pane :label="$t('dataset.update_info')" name="updateInfo">
更新信息TODO
</el-tab-pane>
<!-- <el-tab-pane label="tab3" name="tab3">-->
<!-- tab3-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="tab4" name="tab4">-->
<!-- tab4-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="tab3" name="tab3">-->
<!-- tab3-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="tab4" name="tab4">-->
<!-- tab4-->
<!-- </el-tab-pane>-->
</el-tabs>
<el-dialog :title="table.name" :visible.sync="editField" :fullscreen="true" :show-close="false">

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

@ -1553,6 +1553,7 @@ export default {
field_type:'Field Type',
field_name:'Field Name',
field_origin_name:'Origin Name',
field_check:'Checked'
field_check:'Checked',
update_info:'Update Info'
}
};

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

@ -1564,7 +1564,8 @@ export default {
field_type:'字段类型',
field_name:'字段名',
field_origin_name:'原始名',
field_check:'选中'
field_check:'选中',
update_info:'更新信息'
},
datasource: {
create: '新建数据连接',

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

@ -1554,6 +1554,7 @@ export default {
field_type:'字段類型',
field_name:'字段名',
field_origin_name:'原始名',
field_check:'選中'
field_check:'選中',
update_info:'更新信息'
}
};