From dc9f7d0cd684061e827fce6fb5f1c225cac48f36 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Thu, 31 Aug 2023 14:50:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=BB=84=E4=BB=B6=E8=AE=BE=E8=AE=A1=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/BizComponent/index.vue | 41 +++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/data-room-ui/packages/BizComponent/index.vue b/data-room-ui/packages/BizComponent/index.vue index 9e5ce708..9e8da89a 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,17 @@ 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', + onClose: () => { + // 此处写提示关闭后需要执行的函数 + if (pageJump) { + this.pageJump() + } + } + }) }) .finally(() => { that.loading = false @@ -287,11 +293,16 @@ 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', + onClose: () => { + // 此处写提示关闭后需要执行的函数 + if (pageJump) { + this.pageJump() + } + } + }) }) .finally(() => { this.loading = false From ca4a5c0e098c7e02134fdbeb48e861a283872c52 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Thu, 31 Aug 2023 14:58:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E5=A4=B4=E9=83=A8=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E6=B7=BB=E5=8A=A0gitee=20fork=20=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Layout/BigScreenHomeLayout/index.vue | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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" /> + + Fork me on Gitee +
@@ -197,4 +207,14 @@ export default { -webkit-background-clip: text; } } +.fork-me-on-gitee{ + position: absolute; + top: 0; + right: 0; + z-index: 999; + img{ + width: 120px; + height: 120px; + } +} From f2c5926109cbf598096e538c7d2a845c3e8a0770 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Thu, 31 Aug 2023 15:07:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E9=A1=B5=E9=9D=A2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=98=8E=E4=BA=AE=E6=A8=A1=E5=BC=8F=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 页面新增明亮模式背景相关配置项 --- .../dataroom/core/module/manage/dto/DataRoomPageDTO.java | 6 ++++++ 1 file changed, 6 insertions(+) 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; From 676577388c7021f31afba4e93fffe5c4769fb6d2 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Thu, 31 Aug 2023 15:07:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=BB=84=E4=BB=B6=E8=AE=BE=E8=AE=A1=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/BizComponent/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data-room-ui/packages/BizComponent/index.vue b/data-room-ui/packages/BizComponent/index.vue index 9e8da89a..3da4900f 100644 --- a/data-room-ui/packages/BizComponent/index.vue +++ b/data-room-ui/packages/BizComponent/index.vue @@ -276,6 +276,7 @@ export default { this.$message({ message: '保存成功', type: 'success', + duration: 800, onClose: () => { // 此处写提示关闭后需要执行的函数 if (pageJump) { @@ -296,6 +297,7 @@ export default { this.$message({ message: '保存成功', type: 'success', + duration: 800, onClose: () => { // 此处写提示关闭后需要执行的函数 if (pageJump) {