Merge branch 'master' of github.com:gcpaas/DataRoom

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": {

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

@@ -78,7 +78,7 @@ export default {
         const inputIcon = document.querySelector(`.${config.customize.icon.name}`)
         inputIcon.style.fontSize = config.customize.inputStyle.fontSize + 'px'
       }
-      // 样式改变时更新主题配置
+      // 只有样式改变时更新主题配置，切换主题时不需要保存
       if (!isUpdateTheme) {
         config.theme = settingToTheme(_.cloneDeep(config), this.customTheme)
         this.changeChartConfig(config)

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-option
-              纯色
+              label="纯色"
-            </el-radio>
+              value="pure"
-            <el-radio label="gradient">
+            />
-              渐变色
+            <el-option
-            </el-radio>
+              label="渐变色"
-          </el-radio-group>
+              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-option
-              透明
+              label="透明"
-            </el-radio>
+              value="transparent"
-            <el-radio label="pure">
+            />
-              纯色
+            <el-option
-            </el-radio>
+              label="纯色"
-            <el-radio label="gradient">
+              value="pure"
-              渐变色
+            />
-            </el-radio>
+            <el-option
-          </el-radio-group>
+              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>
+<style lang="scss" scoped>
-    @import "../../assets/style/settingWrap.scss";
+@import '../../assets/style/settingWrap.scss';
-    .bs-setting-wrap{
+@import '../../assets/style/bsTheme.scss';
-      padding-top: 16px;
+
-    }
+.bs-setting-wrap {
-    .lc-field-body {
+  padding:12px 16px;
+}
+
+.lc-field-body {
   padding: 12px 16px;
-    }
+}
-  </style>
+</style>

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

@@ -63,6 +63,7 @@ export default {
     // 由于静态组件没有混入公共函数，所以需要定义一个changeStyle方法，以免报错
     changeStyle (config) {
     },
+    // 点击切换主题
     handleChange (val) {
       const pageInfo = this.pageInfo
       pageInfo.chartList = themeToSetting(pageInfo.chartList, val)

data-room-ui/packages/BigScreenDesign/LeftPanel.vue

@@ -147,7 +147,6 @@
 </template>
 <script>
 import cloneDeep from 'lodash/cloneDeep'
-// import 'data-room-ui/assets/symbols/bigScreenIcon/iconfont.js'
 import basicComponents from 'data-room-ui/js/config/basicComponentsConfig'
 import g2PlotComponents, { getCustomPlots } from '../G2Plots/plotList'
 import borderComponents from 'data-room-ui/js/config/borderComponentsConfig'

data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue

@@ -66,6 +66,7 @@
               popper-class="bs-el-select"
               placeholder="请选择主题"
               clearable
+              @change="changeTheme"
             >
               <el-option
                 v-for="themeItem in themeOptions"
@@ -191,6 +192,7 @@ import { getThemeConfig } from 'data-room-ui/js/api/bigScreenApi'
 // import _ from 'lodash'
 import cloneDeep from 'lodash/cloneDeep'
 import { G2 } from '@antv/g2plot'
+import { themeToSetting } from 'data-room-ui/js/utils/themeFormatting'
 export default {
   name: 'OverallSetting',
   components: {
@@ -270,15 +272,15 @@ export default {
         {
           value: 'light',
           label: '明亮'
-        },
-        {
-          value: 'auto',
-          label: '透明'
-        },
-        {
-          value: 'custom',
-          label: '自定义'
         }
+        // {
+        //   value: 'auto',
+        //   label: '透明'
+        // },
+        // {
+        //   value: 'custom',
+        //   label: '自定义'
+        // }
       ],
       form: {
         w: 1920,
@@ -286,7 +288,7 @@ export default {
         bg: '',
         bgColor: '#151a26', // 背景色
         opacity: 100,
-        customTheme: 'auto',
+        customTheme: 'dark',
         themeJson: {},
         cacheDataSets: [],
         refreshConfig: [],
@@ -361,6 +363,12 @@ export default {
       'changeChartKey',
       'changeRefreshConfig'
     ]),
+    // 切换主题时更新主题配置
+    changeTheme (theme) {
+      const pageInfo = this.pageInfo
+      pageInfo.chartList = themeToSetting(pageInfo.chartList, theme)
+      this.changePageInfo(pageInfo)
+    },
     init () {
       if (!this.pageInfo.pageConfig.refreshConfig) {
         this.pageInfo.pageConfig.refreshConfig = []

data-room-ui/packages/assets/symbols/bigScreenIcon/iconfont.json

@@ -1,128 +0,0 @@
-{
-  "id": "4203436",
-  "name": "big-screen-icon",
-  "font_family": "iconfont",
-  "css_prefix_text": "icon-",
-  "description": "",
-  "glyphs": [
-    {
-      "icon_id": "37005716",
-      "name": "16marquee",
-      "font_class": "a-16marquee",
-      "unicode": "e621",
-      "unicode_decimal": 58913
-    },
-    {
-      "icon_id": "36836851",
-      "name": "08z9iframe",
-      "font_class": "a-08z9iframe",
-      "unicode": "e611",
-      "unicode_decimal": 58897
-    },
-    {
-      "icon_id": "36836852",
-      "name": "10hengxian",
-      "font_class": "a-10hengxian",
-      "unicode": "e612",
-      "unicode_decimal": 58898
-    },
-    {
-      "icon_id": "36836853",
-      "name": "04table",
-      "font_class": "a-04table",
-      "unicode": "e613",
-      "unicode_decimal": 58899
-    },
-    {
-      "icon_id": "36836854",
-      "name": "01carousel",
-      "font_class": "a-01carousel",
-      "unicode": "e614",
-      "unicode_decimal": 58900
-    },
-    {
-      "icon_id": "36836855",
-      "name": "11shuxian",
-      "font_class": "a-11shuxian",
-      "unicode": "e615",
-      "unicode_decimal": 58901
-    },
-    {
-      "icon_id": "36836856",
-      "name": "07timeCountDown",
-      "font_class": "a-07timeCountDown",
-      "unicode": "e616",
-      "unicode_decimal": 58902
-    },
-    {
-      "icon_id": "36836857",
-      "name": "03rank",
-      "font_class": "a-03rank",
-      "unicode": "e617",
-      "unicode_decimal": 58903
-    },
-    {
-      "icon_id": "36836858",
-      "name": "02scrollBoard",
-      "font_class": "a-02scrollBoard",
-      "unicode": "e618",
-      "unicode_decimal": 58904
-    },
-    {
-      "icon_id": "36836859",
-      "name": "14button",
-      "font_class": "a-14button",
-      "unicode": "e619",
-      "unicode_decimal": 58905
-    },
-    {
-      "icon_id": "36836860",
-      "name": "13input",
-      "font_class": "a-13input",
-      "unicode": "e61a",
-      "unicode_decimal": 58906
-    },
-    {
-      "icon_id": "36836861",
-      "name": "12video",
-      "font_class": "a-12video",
-      "unicode": "e61b",
-      "unicode_decimal": 58907
-    },
-    {
-      "icon_id": "36836862",
-      "name": "15link",
-      "font_class": "a-15link",
-      "unicode": "e61c",
-      "unicode_decimal": 58908
-    },
-    {
-      "icon_id": "36836863",
-      "name": "09digtal",
-      "font_class": "a-09digtal",
-      "unicode": "e61d",
-      "unicode_decimal": 58909
-    },
-    {
-      "icon_id": "36836864",
-      "name": "06currentTime",
-      "font_class": "a-06currentTime",
-      "unicode": "e61e",
-      "unicode_decimal": 58910
-    },
-    {
-      "icon_id": "36836865",
-      "name": "05map",
-      "font_class": "a-05map",
-      "unicode": "e61f",
-      "unicode_decimal": 58911
-    },
-    {
-      "icon_id": "36836866",
-      "name": "00LcdpText",
-      "font_class": "a-00LcdpText",
-      "unicode": "e620",
-      "unicode_decimal": 58912
-    }
-  ]
-}