diff --git a/frontend/src/components/drawer-filter/src/DrawerEnumFilter.vue b/frontend/src/components/drawer-filter/src/DrawerEnumFilter.vue index e845545c..ddf6f9b2 100644 --- a/frontend/src/components/drawer-filter/src/DrawerEnumFilter.vue +++ b/frontend/src/components/drawer-filter/src/DrawerEnumFilter.vue @@ -84,7 +84,7 @@ useEmitt({ padding: 1px 6px; background: var(--deTextPrimary5, #f5f6f7); color: var(--deTextPrimary, #1f2329); - border-radius: 2px; + border-radius: 4px; cursor: pointer; display: inline-block; margin-bottom: 12px; @@ -92,8 +92,8 @@ useEmitt({ .active, .more:hover { - background: var(--primary10, var(--ed-color-primary-1a, #1cba9033)); - color: var(--primaryselect, #0c296e); + background: var(--ed-color-primary-1a, #1cba9033); + color: #0b4a3a; } .more { diff --git a/frontend/src/components/drawer-filter/src/DrawerFilter.vue b/frontend/src/components/drawer-filter/src/DrawerFilter.vue index 06724a97..afcdd9d1 100644 --- a/frontend/src/components/drawer-filter/src/DrawerFilter.vue +++ b/frontend/src/components/drawer-filter/src/DrawerFilter.vue @@ -76,7 +76,6 @@ useEmitt({ > :nth-child(1) { color: var(--deTextSecondary, #1f2329); - font-family: var(--de-custom_font, 'PingFang'); font-style: normal; font-weight: 400; font-size: 14px; diff --git a/frontend/src/components/layout/LayoutDsl.vue b/frontend/src/components/layout/LayoutDsl.vue index d851830b..14fa635e 100644 --- a/frontend/src/components/layout/LayoutDsl.vue +++ b/frontend/src/components/layout/LayoutDsl.vue @@ -62,7 +62,7 @@ const showSysmenu = computed(() => { -
+
@@ -91,6 +91,7 @@ const showSysmenu = computed(() => { height: 100%; padding: 16px; position: relative; + min-width: 240px; .bottom { position: absolute; @@ -137,8 +138,9 @@ const showSysmenu = computed(() => { &.left-side-collapse { width: 64px; + min-width: 64px; padding: 16px 12px; - animation: rotate 1s ease-in-out; + // animation: rotate 0.1s ease-in-out; .ed-menu--collapse { --ed-menu-icon-width: 32px; @@ -168,18 +170,22 @@ const showSysmenu = computed(() => { } .right-main { - flex: 1; + width: calc(100% - 240px); padding: 8px 8px 8px 0; max-height: 100vh; - overflow-x: auto; + + &.right-side-collapse { + width: calc(100% - 64px); + } .content { width: 100%; height: 100%; padding: 16px 24px; - box-shadow: 0px 2px 4px 0px #1f23291f; background-color: #fff; border-radius: 12px; + box-shadow: 0px 2px 4px 0px #1f23291f; + overflow-x: auto; &:has(.no-padding) { padding: 0; diff --git a/frontend/src/style.less b/frontend/src/style.less index 5d738679..83d47b66 100644 --- a/frontend/src/style.less +++ b/frontend/src/style.less @@ -287,3 +287,33 @@ strong { .ed-button.is-secondary.is-disabled { border-color: #d9dcdf !important; } + +.ed-drawer.btt { + .ed-drawer__body { + padding-bottom: 64px; + } +} + +.ed-tag.ed-tag--info { + --ed-tag-bg-color: #1f23291a !important; + --ed-tag-text-color: #1f2329 !important; + --ed-tag-font-size: 14px; +} + +.hover-icon_with_bg.ed-icon { + cursor: pointer; + position: relative; + &:hover { + &::after { + content: ''; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + background: #1f23291a; + width: 24px; + height: 24px; + border-radius: 6px; + } + } +} diff --git a/frontend/src/views/chat/index.vue b/frontend/src/views/chat/index.vue index b1ca3da3..6a908982 100644 --- a/frontend/src/views/chat/index.vue +++ b/frontend/src/views/chat/index.vue @@ -23,6 +23,7 @@
{ display: flex; align-items: center; flex-wrap: wrap; - padding-bottom: 50px; .card { width: 392px; @@ -1044,12 +1044,24 @@ const saveHandler = () => { margin-right: 0; } } + + .no-margin_top { + margin-top: 0; + } } .drawer-content { width: 800px; margin: 0 auto; - height: calc(100% - 20px); + height: 100%; + padding-bottom: 24px; + overflow-y: auto; + + .ed-form-item { + &:last-child { + margin-bottom: 0; + } + } } .certificate-table_form { diff --git a/frontend/src/views/system/model/ModelForm.vue b/frontend/src/views/system/model/ModelForm.vue index 3a211d6c..68ed89ff 100644 --- a/frontend/src/views/system/model/ModelForm.vue +++ b/frontend/src/views/system/model/ModelForm.vue @@ -459,6 +459,7 @@ defineExpose({ padding-top: 24px; overflow-y: auto; height: calc(100% - 120px); + padding-bottom: 24px; .ed-form-item--default { margin-bottom: 16px; diff --git a/frontend/src/views/system/permission/index.vue b/frontend/src/views/system/permission/index.vue index 77168f37..8bf73c4c 100644 --- a/frontend/src/views/system/permission/index.vue +++ b/frontend/src/views/system/permission/index.vue @@ -948,7 +948,8 @@ const columnRules = { .drawer-content { width: 800px; margin: 0 auto; - height: calc(100% - 8px); + height: 100%; + padding-bottom: 24px; overflow-y: auto; }