diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java index ed529a5f..1282bfca 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java @@ -302,6 +302,7 @@ public class DataSetServiceImpl implements DataSetService { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.select(DataSet::getSetCode, DataSet::getSetName, DataSet::getSetDesc, DataSet::getId) .eq(DataSet::getEnableFlag, Enabled.YES.getValue()); + wrapper.orderByDesc(DataSet::getUpdateTime); return dataSetMapper.selectList(wrapper); } diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java index 92af651a..0485a294 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java @@ -75,6 +75,7 @@ public class DataSourceServiceImpl implements DataSourceService { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.select(DataSource::getSourceCode, DataSource::getSourceName) .eq(DataSource::getEnableFlag, Enabled.YES.getValue()); + wrapper.orderByDesc(DataSource::getUpdateTime); return dataSourceMapper.selectList(wrapper); } diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js index f2a531bd..86ac09dd 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js @@ -1,6 +1,6 @@ /* * @Descripttion: 表格json - * @version: + * @version: * @Author: qianlishi * @Date: 2021-08-29 07:16:10 * @LastEditors: qianlishi @@ -133,7 +133,7 @@ export const widgetTable = { }, { type: 'vue-color', - label: '表格背景', + label: '表格背景色', name: 'tableBgColor', require: false, placeholder: '', diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue index 1fec0164..63e0ae5a 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue @@ -215,11 +215,11 @@ export default { width: 100%; } -.txtScroll-top .infoList li:nth-child(n) { +/*.txtScroll-top .infoList li:nth-child(n) { background: rgb(0, 59, 81); } .txtScroll-top .infoList li:nth-child(2n) { background: rgb(10, 39, 50); -} +}*/ diff --git a/report-ui/src/views/report/datasource/components/EditDataSource.vue b/report-ui/src/views/report/datasource/components/EditDataSource.vue index 563bcb11..03a3ea63 100644 --- a/report-ui/src/views/report/datasource/components/EditDataSource.vue +++ b/report-ui/src/views/report/datasource/components/EditDataSource.vue @@ -11,7 +11,7 @@ - + diff --git a/report-ui/src/views/report/excelreport/index.vue b/report-ui/src/views/report/excelreport/index.vue index ce54af4f..2806fc4f 100644 --- a/report-ui/src/views/report/excelreport/index.vue +++ b/report-ui/src/views/report/excelreport/index.vue @@ -6,7 +6,7 @@ !-->