From f77fc8aaf5528f0a25e69bcfc7131bfc6e8b512a Mon Sep 17 00:00:00 2001 From: devin Date: Thu, 14 Sep 2023 16:03:53 +0800 Subject: [PATCH 1/3] fix --- packages/opendesign/src/tab/style/style.scss | 2 +- packages/opendesign/src/tab/style/var.scss | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/opendesign/src/tab/style/style.scss b/packages/opendesign/src/tab/style/style.scss index 84627d7a..6a48f63f 100644 --- a/packages/opendesign/src/tab/style/style.scss +++ b/packages/opendesign/src/tab/style/style.scss @@ -6,7 +6,7 @@ align-items: center; position: relative; width: 100%; - justify-content: var(--tab-nav-justify, 'center'); + justify-content: var(--tab-nav-justify, center); } .o-tab-head { font-size: var(--tab-nav-text-size); diff --git a/packages/opendesign/src/tab/style/var.scss b/packages/opendesign/src/tab/style/var.scss index f9d4017f..8d48bb73 100644 --- a/packages/opendesign/src/tab/style/var.scss +++ b/packages/opendesign/src/tab/style/var.scss @@ -15,8 +15,6 @@ --tab-nav-archor-color: var(--o-color-primary1); --tab-nav-archor-height: 2px; - --tab-nav-justify: flex-start; - --tab-nav-close-size: var(--o-icon_size_control-xs); --tab-nav-icon-size: var(--o-icon_size_control-m); } -- Gitee From 2278e2fccb8fef6fa79e1a46a24635c790989abd Mon Sep 17 00:00:00 2001 From: devin Date: Thu, 14 Sep 2023 17:03:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=20=E6=8C=89=E9=92=AE=E6=96=87=E5=AD=97?= =?UTF-8?q?=E9=A2=9C=E8=89=B2color-white=EF=BC=8C=E9=B2=B2=E9=B9=8Fascend?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=202.=20option=E6=96=87=E5=AD=97=E9=A2=9C?= =?UTF-8?q?=E8=89=B2hover=E6=97=B6=E4=B8=8D=E5=8F=98=203.=20table=20?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4control1-light=EF=BC=8C=E9=B2=B2=E9=B9=8Fasce?= =?UTF-8?q?nd=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/opendesign/src/button/style/var.scss | 8 ++++---- packages/opendesign/src/option/style/var.scss | 2 +- packages/opendesign/src/table/style/var.scss | 2 +- packages/portal-ak/src/ak/theme/button.scss | 7 +++++++ packages/portal-ak/src/ak/theme/table.scss | 4 ++++ 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/packages/opendesign/src/button/style/var.scss b/packages/opendesign/src/button/style/var.scss index f8ebd82d..e3496027 100644 --- a/packages/opendesign/src/button/style/var.scss +++ b/packages/opendesign/src/button/style/var.scss @@ -9,10 +9,10 @@ --btn-bd-color-disabled: var(--o-color-control1); &.o-btn-solid { - --btn-color: var(--o-color-info1-inverse); - --btn-color-hover: var(--o-color-info1-inverse); - --btn-color-active: var(--o-color-info1-inverse); - --btn-color-disabled: var(--o-color-info1-inverse); + --btn-color: rgb(var(--o-color-white)); + --btn-color-hover: rgb(var(--o-color-white)); + --btn-color-active: rgb(var(--o-color-white)); + --btn-color-disabled: rgb(var(--o-color-white)); --btn-bg-color: var(--o-color-control1-light); --btn-bg-color-hover: var(--o-color-control2-light); diff --git a/packages/opendesign/src/option/style/var.scss b/packages/opendesign/src/option/style/var.scss index fe615eba..e69e3989 100644 --- a/packages/opendesign/src/option/style/var.scss +++ b/packages/opendesign/src/option/style/var.scss @@ -1,6 +1,6 @@ .o-option { --option-color: var(--o-color-info2); - --option-color-hover: var(--o-color-primary2); + --option-color-hover: var(--o-color-info2); --option-color-active: var(--o-color-primary1); --option-color-disabled: var(--o-color-info4); diff --git a/packages/opendesign/src/table/style/var.scss b/packages/opendesign/src/table/style/var.scss index 315ab486..3f7fa5f1 100644 --- a/packages/opendesign/src/table/style/var.scss +++ b/packages/opendesign/src/table/style/var.scss @@ -11,7 +11,7 @@ --table-tip-text-height: var(--o-line_height-tip1); --table-tip-color: var(--o-color-info3); - --table-head-bg: var(--o-color-control3-light); + --table-head-bg: var(--o-color-control1-light); --table-row-hover: var(--o-color-control2-light); --table-row-active: var(--o-color-control3-light); diff --git a/packages/portal-ak/src/ak/theme/button.scss b/packages/portal-ak/src/ak/theme/button.scss index 7c54ff5a..e7217d60 100644 --- a/packages/portal-ak/src/ak/theme/button.scss +++ b/packages/portal-ak/src/ak/theme/button.scss @@ -1,5 +1,12 @@ @use './mixin.scss' as *; +.o-btn.o-btn-solid { + --btn-color: var(--o-color-info1-inverse); + --btn-color-hover: var(--o-color-info1-inverse); + --btn-color-active: var(--o-color-info1-inverse); + --btn-color-disabled: var(--o-color-info1-inverse); +} + .o-btn-outline.o-btn-primary:not(.o-btn-disabled) { --btn-color: var(--o-color-info1); --btn-color-hover: var(--o-color-info1-inverse); diff --git a/packages/portal-ak/src/ak/theme/table.scss b/packages/portal-ak/src/ak/theme/table.scss index 2162e0ce..cea857bf 100644 --- a/packages/portal-ak/src/ak/theme/table.scss +++ b/packages/portal-ak/src/ak/theme/table.scss @@ -1 +1,5 @@ @use './mixin.scss' as *; + +.o-table { + --table-head-bg: var(--o-color-control3-light); +} -- Gitee From d461918dbbca5aa361d12b3cdf26c60ebb55dd00 Mon Sep 17 00:00:00 2001 From: devin Date: Thu, 14 Sep 2023 17:04:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?upload=E6=A0=B7=E5=BC=8F=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/upload/__demo__/UploadBasic.vue | 1 + .../opendesign/src/upload/style/media.scss | 5 ++ .../opendesign/src/upload/style/style.scss | 80 ++----------------- packages/opendesign/src/upload/style/var.scss | 7 +- packages/portal-ak/src/ak/theme/upload.scss | 16 ++-- 5 files changed, 21 insertions(+), 88 deletions(-) diff --git a/packages/opendesign/src/upload/__demo__/UploadBasic.vue b/packages/opendesign/src/upload/__demo__/UploadBasic.vue index e390c6f3..6f5be72f 100644 --- a/packages/opendesign/src/upload/__demo__/UploadBasic.vue +++ b/packages/opendesign/src/upload/__demo__/UploadBasic.vue @@ -58,6 +58,7 @@ const onSelect = (f: UploadFileT[]) => { :on-after-select="onAfterSelect" :upload-request="uploadRequest" btn-label="上传(单选)" + :btn-props="{ size: 'large' }" color="normal" variant="solid" accept=".docx,.xlsx,.xls,.doc,.pdf" diff --git a/packages/opendesign/src/upload/style/media.scss b/packages/opendesign/src/upload/style/media.scss index 254eeeaa..5b759338 100644 --- a/packages/opendesign/src/upload/style/media.scss +++ b/packages/opendesign/src/upload/style/media.scss @@ -5,3 +5,8 @@ opacity: 1; } } +@include respond-to('<=laptop') { + .o-upload { + --upload-drag-padding: 16px 8px; + } +} diff --git a/packages/opendesign/src/upload/style/style.scss b/packages/opendesign/src/upload/style/style.scss index 98e8bbba..c97bf9e3 100644 --- a/packages/opendesign/src/upload/style/style.scss +++ b/packages/opendesign/src/upload/style/style.scss @@ -3,7 +3,6 @@ .o-upload-select { position: relative; - display: inline-block; cursor: pointer; } .o-upload-select-input { @@ -99,14 +98,14 @@ margin-left: 8px; } .o-upload-select-extra { - font-size: var(--o-font_size-tip1); - line-height: var(--o-line_height-tip1); + font-size: var(--o-font_size-tip2); + line-height: var(--o-line_height-tip2); color: var(--o-color-info4); margin-top: 8px; } .o-upload-item-tip { - font-size: var(--o-font_size-tip1); - line-height: var(--o-line_height-tip1); + font-size: var(--o-font_size-tip2); + line-height: var(--o-line_height-tip2); color: var(--o-color-info1); display: flex; margin-top: 4px; @@ -246,9 +245,6 @@ } // 拖拽上传 -.o-upload-select-drag { - width: 100%; -} .o-upload-drag { padding: var(--upload-drag-padding); font-size: var(--o-font_size-tip1); @@ -257,7 +253,7 @@ background-color: var(--upload-drag-bg-color); border: var(--upload-drag-bd); text-align: center; - width: 100%; + width: var(--upload-drag-width); border-radius: var(--upload-drag-radius); text-align: center; transition: all var(--o-easing-standard) var(--o-duration-m2); @@ -282,55 +278,14 @@ } } .o-upload-drag-disabled { - &, - &:hover { + @include me-hover { cursor: not-allowed; color: var(--upload-drag-color-disabled); border: var(--upload-drag-bd-disabled); background-color: var(--upload-drag-bg-color-disabled); } } -.o-upload-drag-icon { - font-size: var(--upload-icon-size-l); - vertical-align: top; - + .o-upload-drag-label { - margin-top: 12px; - } -} -// 拖拽上传 -.o-upload-select-drag { - width: 100%; -} -.o-upload-drag { - padding: var(--upload-drag-padding); - font-size: var(--o-font_size-tip1); - line-height: var(--o-line_height-text1); - color: var(--upload-drag-color); - background-color: var(--upload-drag-bg-color); - border: var(--upload-drag-border); - text-align: center; - width: 100%; - border-radius: var(--upload-drag-radius); - text-align: center; - transition: all var(--o-easing-standard) var(--o-duration-m2); - &:hover { - border: var(--upload-drag-border-hover); - } -} -.o-upload-drag-dragging { - border: var(--upload-drag-border-dragging); - background-color: var(--upload-drag-bg-color-dragging); -} -.o-upload-drag-disabled { - &, - &:hover { - cursor: not-allowed; - color: var(--upload-drag-color-disabled); - border: var(--upload-drag-border-disabled); - background-color: var(--upload-drag-bg-color-disabled); - } -} .o-upload-drag-icon { font-size: var(--upload-icon-size-l); vertical-align: top; @@ -339,29 +294,6 @@ } } -// 图片上传 -.o-upload-card-add { - border: var(--upload-card-border); - width: var(--upload-card-width); - height: var(--upload-card-height); - display: flex; - align-items: center; - justify-content: center; - border-radius: var(--upload-card-radius); - text-align: center; - color: var(--upload-color); - cursor: pointer; - font-size: var(--o-font_size-tip1); - line-height: var(--o-line_height-text1); -} -.o-upload-card-add-icon { - font-size: var(--upload-icon-size-l); - vertical-align: top; - + .o-upload-card-label { - margin-top: 8px; - } -} - .o-upload-list-picture-card { display: flex; flex-wrap: wrap; diff --git a/packages/opendesign/src/upload/style/var.scss b/packages/opendesign/src/upload/style/var.scss index 5e598d60..fa295694 100644 --- a/packages/opendesign/src/upload/style/var.scss +++ b/packages/opendesign/src/upload/style/var.scss @@ -15,7 +15,8 @@ --upload-progress-bg-color: var(--o-color-control3-light); --upload-progress-value-bg-color: var(--o-color-primary1); - --upload-drag-padding: 32px 0; + --upload-drag-padding: 32px 24px; + --upload-drag-width: 100%; --upload-drag-radius: var(--o-radius_control-s); --upload-drag-color: var(--o-color-info2); --upload-drag-color-disabled: var(--o-color-info4); @@ -41,8 +42,8 @@ --upload-card-bd-disabled: 1px solid var(--o-color-control4); --upload-card-bd-error: 1px solid var(--o-color-danger1); - --upload-card-bg-color: transparent; - --upload-card-bg-color-hover: transparent; + --upload-card-bg-color: var(--o-color-control-light); + --upload-card-bg-color-hover: var(--o-color-control-light); --upload-card-bg-color-disabled: var(--o-color-control4-light); --upload-card-img-fit: cover; diff --git a/packages/portal-ak/src/ak/theme/upload.scss b/packages/portal-ak/src/ak/theme/upload.scss index 7af770ed..8d585c67 100644 --- a/packages/portal-ak/src/ak/theme/upload.scss +++ b/packages/portal-ak/src/ak/theme/upload.scss @@ -1,14 +1,17 @@ @use './mixin.scss' as *; .o-upload { - --upload-card-bg-color: var(--o-color-control-light); - --upload-card-bg-color-hover: var(--o-color-control-light); --upload-drag-bd: 1px solid var(--o-color-control1); --upload-drag-bd-hover: 1px solid var(--o-color-control2); --upload-drag-bd-active: 1px solid var(--o-color-control3); --upload-drag-bd-dragging: 1px solid var(--o-color-control2); --upload-drag-bg-color-dragging: var(--o-color-control-light); --upload-drag-bd-disabled: 1px solid var(--o-color-control4); + + width: 480px; + @include respond-to('<=laptop') { + width: 240px; + } } .o-upload-progress { left: 28px; @@ -18,12 +21,3 @@ right: 8px; bottom: 4px; } - -.o-upload-select-extra { - font-size: var(--o-font_size-tip2); - line-height: var(--o-line_height-tip2); -} -.o-upload-item-tip { - font-size: var(--o-font_size-tip2); - line-height: var(--o-line_height-tip2); -} -- Gitee