From 8f7135a2a82980090f378ad03f9f2557d5472d4b Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Mon, 8 Jan 2024 14:47:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E5=B0=81=E9=9D=A2=E6=9B=B4=E6=96=B0=E6=93=8D=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=AB=AF=E6=88=AA=E5=9B=BE=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=8E=9F=E5=B0=81=E9=9D=A2?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/manage/service/impl/DataRoomPageServiceImpl.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java
index 7fe48eee..9771b279 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java
@@ -127,6 +127,10 @@ public class DataRoomPageServiceImpl extends ServiceImpl<DataRoomPageDao, PageEn
         if (StringUtils.isBlank(base64String)) {
             return fileUrl;
         }
+        // 如果不是base64字符串，直接返回 NOTE 因为如果前端截图失败，会将原封面地址传过来
+        if (!base64String.startsWith("data:image")) {
+            return base64String;
+        }
         try {
             // 去除base64字符串前缀，从初始位置，到逗号位置
             base64String = base64String.substring(base64String.indexOf(",") + 1);

From 5ef0ee0fcc3e3c9c1a02d3e2aafc5c96bf286db2 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Mon, 8 Jan 2024 14:50:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9A=E5=A4=A7=E5=B1=8F=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E7=BC=96=E7=A0=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BigScreenList/EditForm.vue       | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/data-room-ui/packages/BigScreenList/EditForm.vue b/data-room-ui/packages/BigScreenList/EditForm.vue
index 15b04ff9..9fd9be5e 100644
--- a/data-room-ui/packages/BigScreenList/EditForm.vue
+++ b/data-room-ui/packages/BigScreenList/EditForm.vue
@@ -29,6 +29,25 @@
             class="bs-el-input"
           />
         </el-form-item>
+        <el-form-item
+          v-if="!!dataForm.id"
+          label="大屏编码"
+        >
+          <el-input
+            style="width: 200px"
+            v-model="dataForm.code"
+            readonly
+            class="bs-el-input"
+          />
+          <el-button
+            style="margin-left: 10px;"
+            type="text"
+            @click="copyCode"
+            class="bs-el-button"
+          >
+            <i class="el-icon-document-copy" />
+          </el-button>
+        </el-form-item>
         <el-form-item
           label="推荐分辨率"
         >
@@ -390,6 +409,21 @@ export default {
           code: form.code
         }
       })
+    },
+    /**
+     * 复制大屏编码
+     */
+    copyCode () {
+      let code = this.dataForm.code
+      navigator.clipboard
+        .writeText(code)
+        .then(() => {
+          this.$message.success("复制成功");
+        })
+        .catch(err => {
+          this.$message.error("复制失败，请手动复制");
+          console.error(err);
+        })
     }
   }
 }

From 07499e1a732d0ee4c8e5ffd666521397e21a4622 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Mon, 8 Jan 2024 14:51:03 +0800
Subject: [PATCH 3/3] =?UTF-8?q?docs:=20README=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9cd2f0ad..167fab1d 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
 
 ### 2. 设计器
 
-采用拖拉拽可视化设计，支持20+种图表组件、15种边框组件、10多种修饰组件
+采用拖拉拽可视化设计，支持30+基础组件、40+种图表组件、15种边框组件、10多种修饰组件
 
 <br>
 
@@ -42,7 +42,7 @@
 
 ### 4. 数据源
 
-支持MySQL、PostgreSQL、Oracle 、ClickHouse数据库接入
+支持MySQL、PostgreSQL、Oracle 、ClickHouse、SqlServer数据库接入
 
 <br>