From 5e93b4dd75a0a7a66b918fec967185b577f8d9ea Mon Sep 17 00:00:00 2001 From: zyh Date: Wed, 24 Aug 2022 16:43:55 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/package-lock.json | 12 ++++++------ .../src/assets/css/components/chart/chart.scss | 4 ++++ .../src/components/chart/chart/chartSankey.vue | 14 +++++++------- .../src/components/common/message/src/main.vue | 6 +++--- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json index 824204511..5dc85bc4b 100644 --- a/nezha-fronted/package-lock.json +++ b/nezha-fronted/package-lock.json @@ -4071,7 +4071,7 @@ }, "clipboard": { "version": "2.0.11", - "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz", + "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz", "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==", "requires": { "good-listener": "^1.2.2", @@ -6245,7 +6245,7 @@ }, "delegate": { "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz", + "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" }, "delegates": { @@ -8572,7 +8572,7 @@ }, "good-listener": { "version": "1.2.2", - "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz", + "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==", "requires": { "delegate": "^3.1.2" @@ -16560,7 +16560,7 @@ }, "select": { "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" }, "select-hose": { @@ -18044,7 +18044,7 @@ }, "tiny-emitter": { "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" }, "tinycolor2": { @@ -18743,7 +18743,7 @@ }, "vue-clipboard2": { "version": "0.3.3", - "resolved": "https://registry.npmmirror.com/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz", + "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz", "integrity": "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==", "requires": { "clipboard": "^2.0.0" diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss index 3708b2803..02d812cd5 100644 --- a/nezha-fronted/src/assets/css/components/chart/chart.scss +++ b/nezha-fronted/src/assets/css/components/chart/chart.scss @@ -619,3 +619,7 @@ } } + +.chart-label{ + color: $--color-text-primary; +} \ No newline at end of file diff --git a/nezha-fronted/src/components/chart/chart/chartSankey.vue b/nezha-fronted/src/components/chart/chart/chartSankey.vue index d6db167e3..85b6f0f71 100644 --- a/nezha-fronted/src/components/chart/chart/chartSankey.vue +++ b/nezha-fronted/src/components/chart/chart/chartSankey.vue @@ -343,11 +343,11 @@ export default { } if (str && valueStr) { return ` -
-

+

+

${str}

-

+

${valueStr}

@@ -355,8 +355,8 @@ export default { ` } else if (str) { return ` -
-

+

+

${str}

@@ -364,8 +364,8 @@ export default { ` } else if (valueStr) { return ` -
-

+

+

${valueStr}

diff --git a/nezha-fronted/src/components/common/message/src/main.vue b/nezha-fronted/src/components/common/message/src/main.vue index c1453e30c..e3f2484a6 100644 --- a/nezha-fronted/src/components/common/message/src/main.vue +++ b/nezha-fronted/src/components/common/message/src/main.vue @@ -82,7 +82,7 @@ export default { error: '#FBBAAF' }, // 进度条宽度 - messageWidth: 0 + messageWidth: 100 } }, @@ -129,8 +129,8 @@ export default { // 开启进度条定时器 const part = 100 / (this.duration / 10) this.worker = createWorker(() => { - this.messageWidth += part - if (this.messageWidth > 100) { + this.messageWidth -= part + if (this.messageWidth <= 0) { this.clearTimer() if (!this.closed) { this.close()