Merge remote-tracking branch 'origin/master'

DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json

@@ -20,6 +20,76 @@
             "to": "河北省",
             "type": "move_in",
             "value": 10
+        },
+        {
+            "from": "新疆",
+            "lat1": 87.9688,
+            "lat2": 115.4004,
+            "lng1": 39.7467,
+            "lng2": 39.4688,
+            "to": "河北",
+            "type": "move_in",
+            "value": 10
+        },
+        {
+            "from": "云南",
+            "lat1": 101.8652,
+            "lat2": 115.4004,
+            "lng1": 25.1807,
+            "lng2": 39.4688,
+            "to": "河北",
+            "type": "move_in",
+            "value": 10
+        },
+        {
+            "from": "黑龙江",
+            "lat1": 128.1445,
+            "lat2": 115.4004,
+            "lng1": 48.5156,
+            "lng2": 39.4688,
+            "to": "河北",
+            "type": "move_in",
+            "value": 10
+        },
+        {
+            "from": "加拿大",
+            "lat1": -95.7129,
+            "lat2": 29.80475,
+            "lng1": 56.1304,
+            "lng2": 50.0577,
+            "to": "乌克兰",
+            "type": "move_in",
+            "value": 10
+        },
+        {
+            "from": "中非",
+            "lat1": 20.6796,
+            "lng1": 6.3646,
+            "lat2": 29.80475,
+            "lng2": 50.0577,
+            "to": "乌克兰",
+            "type": "move_in",
+            "value": 10
+        },
+        {
+            "from": "巴西",
+            "lat1": -53.6453,
+            "lng1": -10.8921,
+            "lat2": 29.80475,
+            "lng2": 50.0577,
+            "to": "乌克兰",
+            "type": "move_in",
+            "value": 10
+        },
+        {
+            "from": "俄罗斯",
+            "lat1": 85.7325,
+            "lng1": 67.4894,
+            "lat2": 29.80475,
+            "lng2": 50.0577,
+            "to": "乌克兰",
+            "type": "move_in",
+            "value": 10
         }
     ],
     "columnData": {
@@ -88,4 +158,4 @@
             "remark": "值"
         }
     }
-}
+}

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

@@ -4,7 +4,7 @@
  * @Author: shiyi
 -->
 <template>
-  <div class="bs-setting-wrap">
+  <div>
     <el-form
       ref="form"
       label-width="100px"
@@ -131,17 +131,20 @@
           />
         </el-form-item>
         <el-form-item label="文字颜色类型">
-          <el-radio-group
+          <el-select
             v-model="config.customize.textColorType"
-            class="bs-el-radio-group"
+            popper-class="bs-el-select"
+            class="bs-el-select"
           >
-            <el-radio label="pure">
-              纯色
-            </el-radio>
-            <el-radio label="gradient">
-              渐变色
-            </el-radio>
-          </el-radio-group>
+            <el-option
+              label="纯色"
+              value="pure"
+            />
+            <el-option
+              label="渐变色"
+              value="gradient"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item
           v-if="config.customize.textColorType === 'pure'"
@@ -191,20 +194,24 @@
           />
         </el-form-item>
         <el-form-item label="背景色类型">
-          <el-radio-group
+          <el-select
             v-model="config.customize.backgroundColorType"
-            class="bs-el-radio-group"
+            popper-class="bs-el-select"
+            class="bs-el-select"
           >
-            <el-radio label="transparent">
-              透明
-            </el-radio>
-            <el-radio label="pure">
-              纯色
-            </el-radio>
-            <el-radio label="gradient">
-              渐变色
-            </el-radio>
-          </el-radio-group>
+            <el-option
+              label="透明"
+              value="transparent"
+            />
+            <el-option
+              label="纯色"
+              value="pure"
+            />
+            <el-option
+              label="渐变色"
+              value="gradient"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item
           v-if="config.customize.backgroundColorType === 'pure'"
@@ -364,19 +371,22 @@ export default {
   },
   watch: {
   },
-  mounted () {},
+  mounted () { },
   methods: {
-    changeStyle () {}
+    changeStyle () { }
   }
 }
 </script>
 
-  <style lang="scss" scoped>
-    @import "../../assets/style/settingWrap.scss";
-    .bs-setting-wrap{
-      padding-top: 16px;
-    }
-    .lc-field-body {
-      padding: 12px 16px;
-    }
-  </style>
+<style lang="scss" scoped>
+@import '../../assets/style/settingWrap.scss';
+@import '../../assets/style/bsTheme.scss';
+
+.bs-setting-wrap {
+  padding:12px 16px;
+}
+
+.lc-field-body {
+  padding: 12px 16px;
+}
+</style>