diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss index 90a1ebd90..05fedcb33 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -307,9 +307,8 @@ border-right: unset !important; } .editor-core{ - height: auto !important; + height: 0 !important; flex: 1; - overflow: hidden; } .ql-container.ql-snow { border: unset !important diff --git a/nezha-fronted/src/assets/css/components/common/popBox/snapshotProgress.scss b/nezha-fronted/src/assets/css/components/common/popBox/snapshotProgress.scss new file mode 100644 index 000000000..3584d3cc1 --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/popBox/snapshotProgress.scss @@ -0,0 +1,79 @@ +.nz-dialog.snapshot-dialog{ + .el-dialog__header{ + padding: 15px; + padding-right: 40px; + border-bottom: 1px solid $--border-color-light; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + .el-dialog__title{ + font-family: Roboto-Medium; + font-size: 16px; + color: $--color-text-primary; + letter-spacing: 0; + font-weight: 500; + } + } + .el-dialog__body{ + padding: 20px; + padding-bottom: 30px; + .snapshot-name,.snapshot-time{ + font-family: Roboto-Regular; + font-size: 14px; + color: $--color-text-regular; + letter-spacing: 0; + font-weight: 400; + } + .el-progress-bar{ + margin-top: 20px; + overflow: hidden; + position: relative; + .el-progress-bar__outer{ + height: 20px; + border-radius: 0; + background-color: $--background-color-2; + border: 1px solid $--border-color-light; + box-sizing: border-box; + overflow: unset; + .el-progress-bar__inner{ + transition: width 0.3s linear; + border-radius: 0; + background-color:#3B92F1; + height: 18px; + // height: 20px; + // position: absolute; + // left: -1px; + // top: -1px; + } + } + } + .snapshot-elapsed{ + font-family: Roboto-Black; + font-size: 12px; + color: $--color-text-regular; + letter-spacing: 0; + line-height: 17px; + font-weight: 400; + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 2px; + } + .snapshot-msg{ + font-family: Roboto-Regular; + font-size: 14px; + color: $--color-text-regular; + letter-spacing: 0; + line-height: 16px; + font-weight: 400; + margin-top: 20px; + } + } + .el-dialog__footer{ + padding: 12px 20px; + border-top: 1px solid $--border-color-light; + .el-message-box__btns{ + padding: 0; + } + } +} diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss index 134b5a21b..3136fcffe 100644 --- a/nezha-fronted/src/assets/css/components/index.scss +++ b/nezha-fronted/src/assets/css/components/index.scss @@ -26,6 +26,7 @@ @import './common/popBox/selectPanel.scss'; @import './common/popBox/selectDashboard.scss'; @import './common/popBox/selectWalk.scss'; +@import './common/popBox/snapshotProgress.scss'; @import './common/project/popData/Info.scss'; @import './common/project/L5/popData/common.scss'; @import './common/project/L5/CanvasContextMenu.scss'; diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 3ad324907..9d5b5dc0d 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1282,7 +1282,7 @@ li { } .import-failContent-dialog{ .el-dialog__header{ - padding: 14px; + padding: 15px; border-bottom: 1px solid $--border-color-light; } .el-dialog__body{ diff --git a/nezha-fronted/src/components/chart/richTextEditor.vue b/nezha-fronted/src/components/chart/richTextEditor.vue index 969e1b4a3..9a70ad7db 100644 --- a/nezha-fronted/src/components/chart/richTextEditor.vue +++ b/nezha-fronted/src/components/chart/richTextEditor.vue @@ -44,6 +44,7 @@ export default { ['image'] // 上传图片 ] }, + bounds: '.rich-text-editor', placeholder: this.placeholder }, maxLength: 0, // 记录最大长度 diff --git a/nezha-fronted/src/components/common/snapshotProgress/snapshotProgress.vue b/nezha-fronted/src/components/common/snapshotProgress/snapshotProgress.vue new file mode 100644 index 000000000..67c14d354 --- /dev/null +++ b/nezha-fronted/src/components/common/snapshotProgress/snapshotProgress.vue @@ -0,0 +1,211 @@ + + + diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 4fa4adf80..77dabbace 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -142,6 +142,8 @@ + + @@ -162,6 +164,7 @@ import htmlToPdfMixin from '@/components/common/mixin/htmlToPdfMixin' import exportHtmlMixin from '@/components/common/mixin/exportHtml' import * as echarts from 'echarts' import panelVariables from '@/components/common/panel/panelVariables' +import snapshotProgress from '@/components/common/snapshotProgress/snapshotProgress.vue' // import FileSaver from 'file-saver' // import chartData from './testData' export default { @@ -309,7 +312,8 @@ export default { // 查看模式 mode: '', variables: [], - variablesInit: false // 判断variables 是否加载完成 + variablesInit: false, // 判断variables 是否加载完成 + snapshotVisible: false } }, components: { @@ -319,7 +323,8 @@ export default { selectDashboard, chartTempBox, chartRightBox, - panelVariables // 处理panel变量的组件 + panelVariables, // 处理panel变量的组件 + snapshotProgress // 快照进度 }, computed: { chartRightBoxShow () { @@ -994,7 +999,8 @@ export default { if (type === 'PDF') { this.htmlToPdf() } else { - this.exportToHtml(this.showPanel.name) + // this.exportToHtml(this.showPanel.name) + this.snapshotVisible = true } }, // 切换查看模式