[update]修改部分组件样式

SuperMap · Oct 14, 2024 · 99f9953 · 99f9953
1 parent b8b25d2
commit 99f9953
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 7 deletions.
diff --git a/src/common/_utils/style/theme/theme.json b/src/common/_utils/style/theme/theme.json
@@ -30,9 +30,9 @@
     "btnHoverColor": "#EA7568",
     "btnActiveColor": "#CC211C",
 
-    "successColor": "#2BA250",
+    "successColor": "#3DAB1B",
     "infoColor": "#3499E5",
-    "warningColor": "#F0BD3E",
+    "warningColor": "#E2CA34",
     "dangerColor": "#DC5849",
     "shadowBase": "rgba(0, 0, 0, 0.35)",
     "shadowTooltip": "rgba(0, 0, 0, 0.35)",
@@ -145,9 +145,9 @@
     "l100": "#FFFFFF",
     "btnHoverColor": "#F6241D",
     "btnActiveColor": "#D7000E",
-    "successColor": "#51BEFC",
+    "successColor": "#00BC00",
     "infoColor": "#0081E2",
-    "warningColor": "#FAAD14",
+    "warningColor": "#F2B200",
     "dangerColor": "#FF4D4F",
     "shadowBase": "rgba(0, 0, 0, 0.14)",
     "shadowTooltip": "rgba(0, 0, 0, 0.14)",
@@ -252,9 +252,9 @@
     "hoverColor": "#e5666f",
     "hoverBg": "rgba(255, 255, 255, 0.04)",
     "clickColor": "#dc333f",
-    "successColor": "#2BA250",
+    "successColor": "#3DAB1B",
     "infoColor": "#3499E5",
-    "warningColor": "#F0BD3E",
+    "warningColor": "#E2CA34",
     "dangerColor": "#DC5849",
     "iconColorHover": "rgba(255, 255, 255, 0.75)",
     "headingColor": "rgba(255, 255, 255, 0.85)",

diff --git a/src/common/message/style/message.scss b/src/common/message/style/message.scss
@@ -4,6 +4,7 @@
 @include b(message) {
   &-notice-content {
     background: $message-background;
+    color: $text-color-active;
   }
 
   &-error .#{$iconfont-css-prefix} {

diff --git a/src/common/modal/style/modal.scss b/src/common/modal/style/modal.scss
@@ -3,12 +3,32 @@
 @import '../../_utils/style/theme/theme.scss';
 
 @include b (modal) {
+  $modal-prefix: &;
+
   @include e(content, '-') {
     background-color: $modal-content-bg;
+
+    #{$modal-prefix}-header {
+      padding: 14px 24px;
+      border-color: $border-color-secondary;
+      #{$modal-prefix}-title {
+        line-height: 24px;
+      }
+    }
+    #{$modal-prefix}-footer {
+      padding: 10px 24px;
+      border-color: $border-color-secondary;
+    }
   }
 
   @include e(close, '-') {
     color: $text-color-secondary;
+    &-x {
+      line-height: 52px;
+      height: 52px;
+      width: 64px;
+    }
+
   }
 
   @include e(confirm, '-') {
@@ -19,5 +39,21 @@
     &-confirm &-body > .#{$iconfont-css-prefix} {
       color: $warning-color;
     }
+    &-body &-title {
+      line-height: 24px;
+    }
+    &-body {
+      .#{$iconfont-css-prefix} {
+        margin-right: 12px;
+        font-size: 24px;
+
+        + #{$modal-prefix}-title + #{$modal-prefix}-content {
+          margin-left: 36px;
+        }
+      }
+    }
+    #{$modal-prefix}-body {
+      padding: 20px 24px;
+    }
   }
 }
diff --git a/src/common/notification/style/notification.scss b/src/common/notification/style/notification.scss
@@ -3,14 +3,17 @@
 
 @include b(notification) {
   &-notice {
+    $notice-prefix: &;
     background: $message-background;
+    padding: 20px 24px 24px;
 
     &-message {
       color: $heading-color;
     }
 
     @at-root {
       .#{$iconfont-css-prefix}#{&}-icon {
+        margin-left: 0;
         &-warning {
           color: $warning-color;
         }
@@ -26,5 +29,11 @@
         color: $text-color;
       }
     }
+
+    &-with-icon {
+      #{$notice-prefix}-message, #{$notice-prefix}-description {
+        margin-left: 36px;
+      }
+    }
   }
 }
diff --git a/src/common/table/style/table.scss b/src/common/table/style/table.scss
@@ -7,6 +7,7 @@
 
   &-thead > tr > th {
     background: $table-header-bg;
+    position: relative;
     // .#{$iconfont-css-prefix}-filter,
     // #{$table-prefix}-filter-icon {
     //   color: $table-header-icon-color;
@@ -116,6 +117,41 @@
       }
     }
   }
+  &:not(&-bordered) {
+    #{$table-prefix}-thead > tr > th::after {
+      content: "";
+      position: absolute;
+      top: 50%;
+      right: 0;
+      width: 1px;
+      height: 14px;
+      background-color: $border-color-secondary;
+      transform: translateY(-50%);
+    }
+  }
+
+  &-thead > tr > th,
+  &-tbody > tr > td {
+    padding: 13px 24px;
+  }
+
+  &-middle {
+    > #{$table-prefix}-content > #{$table-prefix}-body > table {
+      > #{$table-prefix}-thead > tr > th,
+      > #{$table-prefix}-tbody > tr > td {
+        padding: 9px 24px;
+      }
+    }
+  }
+
+  &-small {
+    > #{$table-prefix}-content > #{$table-prefix}-body > table {
+      > #{$table-prefix}-thead > tr > th,
+      > #{$table-prefix}-tbody > tr > td {
+        padding: 5px 24px;
+      }
+    }
+  }
 
   // &-selection {
   //   .#{$iconfont-css-prefix}-down {

diff --git a/src/common/tooltip/style/tooltip.scss b/src/common/tooltip/style/tooltip.scss
@@ -2,4 +2,7 @@
 @import '../../_utils/style/theme/theme.scss';
 
 @include b (tooltip) {
+  &-inner {
+    padding: 6px 12px;
+  }
 }
diff --git a/src/mapboxgl/web-map/LayerGroup.vue b/src/mapboxgl/web-map/LayerGroup.vue
@@ -20,7 +20,7 @@
             />
             <span class="add-ellipsis">{{ item.title }}</span>
             <div
-              :class="['icon-buttons', showIconsItem === item.id ? 'icon-buttons-visible' : 'icon-buttons-hidden']"
+              :class="['icon-buttons', showIconsItem === item.id ? 'icon-buttons-visible' : 'icon-buttons-hidden',  item.type === 'group' ? 'icon-buttons-in-group' : '']"
             >
               <div v-if="layerOperations.zoomToLayer" class="sm-component-layer-list__zoom">
                 <i

diff --git a/src/mapboxgl/web-map/control/layer-list/style/layer-list.scss b/src/mapboxgl/web-map/control/layer-list/style/layer-list.scss
@@ -70,6 +70,9 @@
         margin-right: 9px;
       }
       & div:last-child {
+        margin-right: 0px;
+      }
+      &.icon-buttons-in-group div{
         margin-right: 12px;
       }
       & i:hover {