Merge branch 'dev' of https://gitee.com/anji-plus/report into dev

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<DataSet> 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);
     }
 

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<DataSource> wrapper = Wrappers.lambdaQuery();
         wrapper.select(DataSource::getSourceCode, DataSource::getSourceName)
                 .eq(DataSource::getEnableFlag, Enabled.YES.getValue());
+        wrapper.orderByDesc(DataSource::getUpdateTime);
         return dataSourceMapper.selectList(wrapper);
     }
 

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: '',

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);
-}
+}*/
 </style>

report-ui/src/views/report/datasource/components/EditDataSource.vue

@@ -11,7 +11,7 @@
         </el-col>
         <el-col :xs="24" :sm="20" :md="6" :lg="6" :xl="6">
           <el-form-item label="数据源编码" prop="sourceCode">
-            <el-input :disabled="updataDisabled" v-model.trim="dialogForm.sourceCode" />
+            <el-input :disabled="updataDisabled" v-model.trim="dialogForm.sourceCode" placeholder="唯一标识" />
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="20" :md="6" :lg="6" :xl="6">

report-ui/src/views/report/excelreport/index.vue

@@ -6,7 +6,7 @@
  !-->
 <template>
   <div class="main-layout">
-    <h2>表格报表基于luckysheet，还在开发中...</h2>
+    <h2>表格报表基于luckysheet，还在开发中，目前只处于集成状态...</h2>
     <el-form ref="form" :model="params" :rules="rules" label-width="120px">
       <!-- 搜索 -->
       <el-row :gutter="10">

report-ui/src/views/report/report/index.vue

@@ -136,11 +136,13 @@ export default {
           },
           {
             label: "报表编码", //报表编码
-            placeholder: "",
+            placeholder: '唯一标识',
             field: "reportCode",
             editField: "reportCode",
             inputType: "input",
+
             rules: [
+              { required: true, message: '请输入报表编码', trigger: 'blur' },
               { min: 1, max: 100, message: "不超过100个字符", trigger: "blur" },
               { validator: validateEngOrNum, trigger: 'blur' },
             ],

report-ui/src/views/report/resultset/components/EditDataSet.vue

@@ -37,6 +37,7 @@
               <el-input
                 :disabled="updataDisabled"
                 v-model.trim="formData.setCode"
+                placeholder="唯一标识"
                 size="mini"
               />
             </el-form-item>