From 484639cc7ecb814f1f74c921df1dcd6349b165d4 Mon Sep 17 00:00:00 2001 From: Wangjiahao <1522128093@qq.com> Date: Thu, 18 May 2023 13:07:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=BB=84=E4=BB=B6=E5=8F=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E8=89=B2=20#5228?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/custom-theme.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/custom-theme.css b/frontend/src/custom-theme.css index e9bb74b11a..1bf5908091 100755 --- a/frontend/src/custom-theme.css +++ b/frontend/src/custom-theme.css @@ -1,5 +1,6 @@ .vjs-custom-skin > .video-js { width: 100%; + background-color: rgba(0, 0, 0, 0); font-family: "PingFang SC","Helvetica Neue","Hiragino Sans GB","Segoe UI","Microsoft YaHei","微软雅黑",sans-serif; } @@ -111,7 +112,7 @@ } .vjs-custom-skin > .video-js .vjs-time-tooltip, -.vjs-custom-skin > .video-js .vjs-mouse-display:after, +.vjs-custom-skin > .video-js .vjs-mouse-display:after, .vjs-custom-skin > .video-js .vjs-play-progress:after { border-radius: 0; font-size: 1em; From f0012447e67bba9474924c5584889787e53df362 Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 19 May 2023 15:32:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E7=BB=84=E5=90=88=E5=9B=BE?= =?UTF-8?q?=E5=89=AF=E8=BD=B4=E5=80=BC=E6=94=AF=E6=8C=81=E5=90=8C=E7=8E=AF?= =?UTF-8?q?=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/components/dragItem/QuotaExtItem.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/chart/components/dragItem/QuotaExtItem.vue b/frontend/src/views/chart/components/dragItem/QuotaExtItem.vue index e428beb5e2..4ce2771a3f 100644 --- a/frontend/src/views/chart/components/dragItem/QuotaExtItem.vue +++ b/frontend/src/views/chart/components/dragItem/QuotaExtItem.vue @@ -319,10 +319,10 @@ export default { }, isEnableCompare() { let xAxis = null - if (Object.prototype.toString.call(this.chart.xaxisExt) === '[object Array]') { - xAxis = JSON.parse(JSON.stringify(this.chart.xaxisExt)) + if (Object.prototype.toString.call(this.chart.xaxis) === '[object Array]') { + xAxis = JSON.parse(JSON.stringify(this.chart.xaxis)) } else { - xAxis = JSON.parse(this.chart.xaxisExt) + xAxis = JSON.parse(this.chart.xaxis) } const t1 = xAxis.filter(ele => { return ele.deType === 1 && SUPPORT_Y_M.includes(ele.dateStyle) From 6e47c1ba9a2fe475df25c82e8d2aeec42afac447 Mon Sep 17 00:00:00 2001 From: Wangjiahao <1522128093@qq.com> Date: Mon, 22 May 2023 10:32:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor(=E9=A6=96=E9=A1=B5):=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=A6=96=E9=A1=B5=E8=AE=BA=E5=9D=9B=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + frontend/src/views/wizard/index.vue | 7 +++++++ 4 files changed, 10 insertions(+) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 36d2dd7baa..533bf9b5ee 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -2785,6 +2785,7 @@ export default { email: 'Email:', tel: 'Tel:', web: 'Web:', + bbs: 'BBS:', apply: 'Free Trial Application', more: 'More', weChat_official_account: 'WeChat official account', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 1f3bce50bb..209d78504a 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -2779,6 +2779,7 @@ export default { email: '郵箱：', tel: '電話：', web: '網址：', + bbs: '論壇：', apply: '免費試用申請', more: '更多', weChat_official_account: '微信公眾號', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index bf71845835..6916b2234a 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -2794,6 +2794,7 @@ export default { email: '邮箱：', tel: '电话：', web: '网址：', + bbs: '论坛：', apply: '免费试用申请', more: '更多', weChat_official_account: '微信公众号', diff --git a/frontend/src/views/wizard/index.vue b/frontend/src/views/wizard/index.vue index 9846564106..9cfad3f6de 100644 --- a/frontend/src/views/wizard/index.vue +++ b/frontend/src/views/wizard/index.vue @@ -98,6 +98,13 @@ href="https://www.dataease.io" >www.dataease.io + + {{ $t('wizard.bbs') }}https://bbs.fit2cloud.com/c/de +
From 4ef0c28431f37657b90a49377198c24fd93800d9 Mon Sep 17 00:00:00 2001 From: Wangjiahao <1522128093@qq.com> Date: Mon, 22 May 2023 11:02:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?refactor(=E9=A6=96=E9=A1=B5):=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=A6=96=E9=A1=B5=E8=AE=BA=E5=9D=9B=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/wizard/index.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/wizard/index.vue b/frontend/src/views/wizard/index.vue index 9cfad3f6de..6c2a77fcdd 100644 --- a/frontend/src/views/wizard/index.vue +++ b/frontend/src/views/wizard/index.vue @@ -402,7 +402,7 @@ export default { .content_bottom_contact { float: left; margin-left: 278px; - width: 300px; + width: 200px; margin-top: 40px; } @@ -410,7 +410,7 @@ export default { font-style: normal; font-weight: 500; font-size: 14px; - line-height: 22px; + line-height: 20px; color: var(--TextPrimary, #1F2329); margin-bottom: 16px; } @@ -418,8 +418,8 @@ export default { .contact_content { font-style: normal; font-weight: 400; - font-size: 14px; - line-height: 22px; + font-size: 12px; + line-height: 16px; color: #646A73; margin-top: 8px; } @@ -429,11 +429,12 @@ export default { } .content_bottom_qr_code { - width: 400px; + width: 500px; float: right; text-align: right; margin-right: 180px; margin-top: 40px; + padding-right: 100px; } .contact_title_qr {