diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/dto/DataRoomPageDTO.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/dto/DataRoomPageDTO.java
index d2552cd9..2a4c1659 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/dto/DataRoomPageDTO.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/dto/DataRoomPageDTO.java
@@ -93,9 +93,15 @@ public class DataRoomPageDTO extends BasePageDTO {
@ApiModelProperty(notes = "背景色")
private String bgColor;
+ @ApiModelProperty(notes = "明亮模式背景色")
+ private String lightBgColor;
+
@ApiModelProperty(notes = "背景图")
private String bg;
+ @ApiModelProperty(notes = "明亮模式背景图")
+ private String lightBg;
+
@ApiModelProperty(notes = "自定义主题")
private String customTheme;
diff --git a/data-room-ui/packages/BizComponent/index.vue b/data-room-ui/packages/BizComponent/index.vue
index 9e5ce708..3da4900f 100644
--- a/data-room-ui/packages/BizComponent/index.vue
+++ b/data-room-ui/packages/BizComponent/index.vue
@@ -237,17 +237,18 @@ export default {
backManagement () {
// 给出一个确认框提示,提示如下确定返回主页面吗?未保存的配置将会丢失。3个按钮 : 留在页面 、离开页面、保存后离开页面
this.$confirm('确定返回主页面吗?未保存的配置将会丢失。', '提示', {
+ distinguishCancelAndClose: true,
confirmButtonText: '保存后离开页面',
cancelButtonText: '离开页面',
cancelButtonClass: 'cancel-btn',
- cancelButtonColor: '#FF6F6F',
- showCancelButton: true,
type: 'warning',
customClass: 'bs-el-message-box'
}).then(() => {
this.save(true)
- }).catch(() => {
- this.pageJump()
+ }).catch((action) => {
+ if (action === 'cancel') {
+ this.pageJump()
+ }
})
},
save (pageJump = false) {
@@ -271,12 +272,18 @@ export default {
translateBlobToBase64(res, function (e) {
this.form.coverPicture = e.result
updateBizComponent(this.form)
- .then((res) => {
- that.$message.success('保存成功')
- console.log(pageJump)
- if (pageJump) {
- this.pageJump()
- }
+ .then(() => {
+ this.$message({
+ message: '保存成功',
+ type: 'success',
+ duration: 800,
+ onClose: () => {
+ // 此处写提示关闭后需要执行的函数
+ if (pageJump) {
+ this.pageJump()
+ }
+ }
+ })
})
.finally(() => {
that.loading = false
@@ -287,11 +294,17 @@ export default {
this.form.coverPicture = dataUrl
updateBizComponent(this.form)
.then(() => {
- console.log(1122)
- this.$message.success('保存成功')
- if (pageJump) {
- this.pageJump()
- }
+ this.$message({
+ message: '保存成功',
+ type: 'success',
+ duration: 800,
+ onClose: () => {
+ // 此处写提示关闭后需要执行的函数
+ if (pageJump) {
+ this.pageJump()
+ }
+ }
+ })
})
.finally(() => {
this.loading = false
diff --git a/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue b/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue
index 45622beb..bebe420a 100644
--- a/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue
+++ b/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue
@@ -15,6 +15,16 @@
@change="changeTab"
/>
+
+
+