Merge remote-tracking branch 'origin/master'

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java

@@ -36,6 +36,9 @@ public class Chart {
     @ApiModelProperty(notes = "图表标题")
     private String title;
 
+    @ApiModelProperty(notes = "名称")
+    private String name;
+
     @ApiModelProperty(notes = "组件类型")
     private String type;
 

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/CustomComponentChart.java

@@ -41,8 +41,8 @@ public class CustomComponentChart extends Chart {
     @ApiModelProperty(notes = "右侧面板自定义配置")
     private List<Map<String, Object>> setting;
 
-    @ApiModelProperty(notes = "组件的唯一名称")
+    @ApiModelProperty(notes = "组件类别")
-    private String name;
+    private String category;
 
     @Data
     public static class Setting {

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/service/impl/DataRoomMapServiceImpl.java

@@ -52,6 +52,7 @@ public class DataRoomMapServiceImpl extends ServiceImpl<DataRoomMapDao, DataRoom
         wrapper.eq(searchDTO.getLevel() != null, DataRoomMapEntity::getLevel, searchDTO.getLevel());
         wrapper.eq(StringUtils.isNotBlank(searchDTO.getParentId()), DataRoomMapEntity::getParentId, searchDTO.getParentId());
         wrapper.eq(searchDTO.getUploadedGeoJson() != null, DataRoomMapEntity::getUploadedGeoJson, searchDTO.getUploadedGeoJson());
+        wrapper.orderByDesc(DataRoomMapEntity::getCreateDate);
         List<DataRoomMapEntity> entityList = this.list(wrapper);
         List<String> idList = entityList.stream().map(DataRoomMapEntity::getId).collect(Collectors.toList());
         List<DataRoomMapVO> voList = Lists.newArrayList();
@@ -66,7 +67,6 @@ public class DataRoomMapServiceImpl extends ServiceImpl<DataRoomMapDao, DataRoom
 
         }
         return voList;
-//        return this.baseMapper.getList(searchDTO);
     }
 
 
@@ -217,6 +217,9 @@ public class DataRoomMapServiceImpl extends ServiceImpl<DataRoomMapDao, DataRoom
      */
     private void parseNextLevelAndSave(DataRoomMapEntity mapEntity, String geoJson) {
         JSONObject jsonObject = new JSONObject(geoJson);
+        if (!jsonObject.has("features")) {
+            throw new GlobalException("GeoJson格式不正确，自动解析失败");
+        }
         JSONArray features = jsonObject.getJSONArray("features");
         if (features == null || features.length() == 0) {
             throw new GlobalException("GeoJson格式不正确，自动解析失败");

data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue

@@ -108,6 +108,35 @@
           </div>
           <SettingTitle>日期时间格式</SettingTitle>
           <div class="lc-field-body">
+            <el-form-item label="时间数据类型">
+              <div class="description">
+                <el-select
+                  v-model="config.customize.formatType"
+                  class="bs-el-select"
+                  popper-class="bs-el-select"
+                  clearable
+                >
+                  <el-option
+                    v-for="(type) in formatTypeOptions"
+                    :key="type.value"
+                    :label="type.label"
+                    :value="type.value"
+                  />
+                </el-select>
+                <el-tooltip
+                  placement="top"
+                >
+                  <span
+                    class="el-icon-question"
+                    style="color:#9e9e9e"
+                  />
+                  <div slot="content">
+                    时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。<br>
+                    自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：yyyy-MM-dd HH:mm:ss对应数据为 2023-10-08 09:30:00。<br>
+                  </div>
+                </el-tooltip>
+              </div>
+            </el-form-item>
             <el-form-item label="时间显示格式化">
               <div class="description">
                 <el-input
@@ -145,35 +174,6 @@
                 </el-tooltip>
               </div>
             </el-form-item>
-            <el-form-item label="时间数据类型">
-              <div class="description">
-                <el-select
-                  v-model="config.customize.formatType"
-                  class="bs-el-select"
-                  popper-class="bs-el-select"
-                  clearable
-                >
-                  <el-option
-                    v-for="(type) in formatTypeOptions"
-                    :key="type.value"
-                    :label="type.label"
-                    :value="type.value"
-                  />
-                </el-select>
-                <el-tooltip
-                  placement="top"
-                >
-                  <span
-                    class="el-icon-question"
-                    style="color:#9e9e9e"
-                  />
-                  <div slot="content">
-                    时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。<br>
-                    自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：yyyy-MM-dd HH:mm:ss对应数据为 2023-10-08 09:30:00。<br>
-                  </div>
-                </el-tooltip>
-              </div>
-            </el-form-item>
             <el-form-item
               v-if="config.customize.formatType === 'custom'"
               label="时间数据格式化"

data-room-ui/packages/BasicComponents/TimePicker/index.vue

@@ -50,15 +50,15 @@ export default {
     }
   },
   watch: {
-
     'config.customize.formatType': {
       handler (val) {
         if (val === 'timestamp') {
-          this.value = 0
+          this.value = new Date().getTime()
-          this.config.customize.valueFormat = 'timestamp'
+          // this.config.customize.format = 'timestamp'
+          // this.config.customize.valueFormat = 'timestamp'
         } else if (val === 'custom') {
-          this.config.customize.valueFormat = 'HH:mm:ss'
+          // this.config.customize.valueFormat = 'HH:mm:ss'
-          this.value = ''
+          this.value = moment(new Date()).format('HH:mm:ss')
         }
       },
       immediate: true

data-room-ui/packages/BasicComponents/TimePicker/setting.vue

@@ -84,6 +84,34 @@
           </div>
           <SettingTitle>时间格式</SettingTitle>
           <div class="lc-field-body">
+            <el-form-item label="时间数据类型">
+              <div class="description">
+                <el-select
+                  v-model="config.customize.formatType"
+                  class="bs-el-select"
+                  popper-class="bs-el-select"
+                >
+                  <el-option
+                    v-for="(type) in formatTypeOptions"
+                    :key="type.value"
+                    :label="type.label"
+                    :value="type.value"
+                  />
+                </el-select>
+                <el-tooltip
+                  placement="top"
+                >
+                  <span
+                    class="el-icon-question"
+                    style="color:#9e9e9e"
+                  />
+                  <div slot="content">
+                    时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。<br>
+                    自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：HH:mm:ss对应数据为 09:30:00。<br>
+                  </div>
+                </el-tooltip>
+              </div>
+            </el-form-item>
             <el-form-item label="时间显示格式化">
               <div class="description">
                 <el-input
@@ -114,34 +142,7 @@
                 </el-tooltip>
               </div>
             </el-form-item>
-            <el-form-item label="时间数据类型">
+
-              <div class="description">
-                <el-select
-                  v-model="config.customize.formatType"
-                  class="bs-el-select"
-                  popper-class="bs-el-select"
-                >
-                  <el-option
-                    v-for="(type) in formatTypeOptions"
-                    :key="type.value"
-                    :label="type.label"
-                    :value="type.value"
-                  />
-                </el-select>
-                <el-tooltip
-                  placement="top"
-                >
-                  <span
-                    class="el-icon-question"
-                    style="color:#9e9e9e"
-                  />
-                  <div slot="content">
-                    时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。<br>
-                    自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：HH:mm:ss对应数据为 09:30:00。<br>
-                  </div>
-                </el-tooltip>
-              </div>
-            </el-form-item>
             <el-form-item
               v-if="config.customize.formatType === 'custom'"
               label="时间数据格式化"
@@ -214,6 +215,20 @@ export default {
       }
     }
   },
+  watch: {
+    'config.customize.formatType': {
+      handler (val) {
+        if (val === 'timestamp') {
+          this.config.customize.format = 'timestamp'
+          this.config.customize.valueFormat = 'timestamp'
+        } else if (val === 'custom') {
+          this.config.customize.format = 'HH:mm:ss'
+          this.config.customize.valueFormat = 'HH:mm:ss'
+        }
+      },
+      immediate: true
+    }
+  },
   data () {
     return {
       // 时间格式化类型选项
@@ -223,7 +238,6 @@ export default {
       ]
     }
   },
-  watch: {},
   mounted () {},
   methods: { }
 }

data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue

@@ -852,7 +852,7 @@ export default {
         // 以下为config配置
         sourceId: '',
         cache: 0,
-        sqlProcess: 'select ',
+        sqlProcess: 'select * from 表名称',
         paramsList: [],
         fieldDesc: {},
         fieldList: [],

data-room-ui/packages/MapDataManagement/src/EditForm.vue

@@ -173,7 +173,7 @@ export default {
   computed: {
     autoParseNextLevelShow () {
       // geoJson 不为空，且未上传过（说明是刚上传的）
-      return !this.isWhitespace(this.mapForm.geoJson) && this.mapForm.uploadedGeoJson === 0
+      return !this.isWhitespace(this.mapForm.geoJson) && !this.isEmpty(this.mapForm.geoJson) && this.mapForm.uploadedGeoJson === 0
     },
     outRangeLabel() {
       return `级别${this.mapForm.level + 1}`;
@@ -264,6 +264,8 @@ export default {
       this.mapForm = _.cloneDeep(map)
       if (!this.isWhitespace(this.mapForm.geoJson)) {
         this.mapForm.geoJson = JSON.parse(this.mapForm.geoJson)
+      } else {
+        this.mapForm.geoJson = {}
       }
     },
     handleClose () {
@@ -275,7 +277,7 @@ export default {
           return false
         }
         let geoJson
-        // 如果geoJson是空的，包括空字符串，纯空格、空对象，空数组，都不允许提交
+        // 如果geoJson是空的，包括空字符串，纯空格、空对象，空数组，都置为空字符串
         if (this.isWhitespace(this.mapForm.geoJson) || this.mapForm.geoJson === '{}' || this.mapForm.geoJson === '[]') {
           geoJson = ''
         } else {
@@ -300,6 +302,15 @@ export default {
       }
       return /^\s*$/.test(str)
     },
+    isEmpty (obj) {
+      if (typeof obj === 'object') {
+        return Object.keys(obj).length === 0 && obj.constructor === Object
+      }
+      if (typeof obj === 'string') {
+        return /^\s*$/.test(obj)
+      }
+      return Array.isArray(obj) && obj.length === 0
+    },
     upload () {
       this.$refs.geoJsonFile.click()
     },