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

DataRoom/dataroom-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>1.0.1.2023081101.Alpha</version>
+        <version>1.0.1.2023083001.Alpha</version>
     </parent>
 
     <artifactId>dataroom-core</artifactId>

DataRoom/dataroom-server/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>1.0.1.2023081101.Alpha</version>
+        <version>1.0.1.2023083001.Alpha</version>
     </parent>
 
     <artifactId>dataroom-server</artifactId>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.gccloud</groupId>
             <artifactId>dataroom-core</artifactId>
-            <version>1.0.1.2023081101.Alpha</version>
+            <version>1.0.1.2023083001.Alpha</version>
         </dependency>
 
         <dependency>

DataRoom/pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.gccloud</groupId>
     <artifactId>dataroom</artifactId>
-    <version>1.0.1.2023081101.Alpha</version>
+    <version>1.0.1.2023083001.Alpha</version>
 
     <packaging>pom</packaging>
     <description>基于G2Plot、Echarts的大屏设计服务端，具备设计、预览能力，支持MySQL、Oracle、PostgreSQL、Groovy等数据集接入
@@ -60,7 +60,7 @@
         <clickhouse.version>0.3.2</clickhouse.version>
         <commons-io.version>2.2</commons-io.version>
         <okhttp3.version>4.9.1</okhttp3.version>
-        <dataset.core.version>1.0.1.2023082801.Alpha</dataset.core.version>
+        <dataset.core.version>1.0.1.2023083001.Alpha</dataset.core.version>
     </properties>
 
     <dependencies>

README.md

@@ -12,7 +12,7 @@
     <img alt="Company" src="https://img.shields.io/badge/Author-科大国创云网科技有限公司-blue.svg">
 </p>
 
-🔥DataRoom是一款基于SpringBoot、MyBatisPlus、ElementUI、G2Plot、Echarts等技术栈的大屏设计器，具备大屏设计、预览能力，支持MySQL、Oracle、PostgreSQL、JSON、JS、HTTP、Groovy等数据集接入，使用简单，完全免费，代码开源。
+🔥DataRoom是一款基于SpringBoot、MyBatisPlus、ElementUI、G2Plot、Echarts等技术栈的大屏设计器，具备大屏设计、预览能力，支持MySQL、Oracle、PostgreSQL、MSSQL、JSON、JS、HTTP、Groovy等数据集接入，使用简单，完全免费，代码开源。
 
 ## 效果图
 

data-room-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcpaas/data-room-ui",
-  "version": "1.0.1-2023082902-Alpha",
+  "version": "1.0.1-2023083002-Alpha",
   "description": "自定义大屏",
   "author": "gcpaas",
   "license": "MIT",

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

@@ -224,7 +224,6 @@ export default {
     speechBroadcast (text) {
       if (this.speech.hasBrowserSupport()) {
         this.speech.setLanguage('zh-CN')
-        this.speech.pitch = 1
         this.speech.init()
         this.speech.speak({ text: text })
       } else {

data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue

@@ -565,7 +565,7 @@
           :source-field-list="sourceFieldList"
         />
         <ComponentRelation
-          v-if="!['carousel','gauge','liquid'].includes(config.type)"
+          v-if="!['carousel','gauge','liquid','marquee'].includes(config.type)"
           :config="config"
           :source-field-list="sourceFieldList"
         />

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

@@ -319,7 +319,9 @@ export default {
             group: randomStr,
             code: randomStr + chart.code
           }
-          this.$refs.Render.addChart(newChart, { x: chart.x, y: chart.y }, true)
+          // 如果是从组件库中添加的自定义组件，则不需要初始化theme
+          const isComponent = true
+          this.$refs.Render.addChart(newChart, { x: chart.x, y: chart.y }, isComponent)
           this.updateRightVisiable(false)
         })
       })

data-room-ui/packages/Render/index.vue

@@ -306,7 +306,7 @@ export default {
       this.hLine = hLine
     },
     // 新增元素
-    addChart (chart, position) {
+    addChart (chart, position, isComponent) {
       const { left, top } = this.$el.getBoundingClientRect()
       const _chart = !chart.code ? JSON.parse(chart) : chart
       let option = _chart.option
@@ -330,12 +330,12 @@ export default {
         option
       }
       config.key = config.code
-      // TODO:新添加一个组件时应该有默认的两套主题
+      // isComponent = false 从左侧新增时需要初始化theme的内容
-      // 先暂时只考虑g2组件
+      // isComponent = true从组件库添加自定义组件时不用初始化
-      // if (['customComponent'].includes(_chart.type)) {
+      if (!isComponent) {
-      config.theme = settingToTheme(config, 'dark')
+        config.theme = settingToTheme(config, 'dark')
-      config.theme = settingToTheme(config, 'light')
+        config.theme = settingToTheme(config, 'light')
-      // }
+      }
       this.addItem(config)
     },
     addSourceChart (chart, position) {