n20-common-lib 3.0.71 → 3.0.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.0.71",
+  "version": "3.0.73",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/assets/css/table.scss

@@ -1,244 +1,3 @@
-/* v2 版本 TablePro 样式 - 兼容有wrapper和无wrapper的情况 */
-.v2-table-pro-wrapper,
-/* 兼容旧版本：直接在TablePro组件内的样式 */
-:where(.v2-table-pro-wrapper) * {
-  /* Element UI 表格基础样式 */
-  & .el-table--small {
-    font-size: 14px;
-  }
-
-  & .el-table--mini {
-    font-size: 12px;
-  }
-
-  & .el-table th {
-    font-weight: $--font-weight-primary;
-  }
-
-  & .el-table--small .el-table__cell {
-    padding: 8px 0;
-  }
-
-  & .el-table .cell {
-    padding-left: 8px;
-    padding-right: 8px;
-  }
-
-  & .el-table--small,
-  & .el-table--mini {
-    .el-table__cell {
-      .el-button--text {
-        padding-top: 2px;
-        padding-bottom: 2px;
-      }
-
-      .el-link {
-        line-height: initial;
-      }
-    }
-  }
-
-  & .el-table--mini {
-    .el-table__cell {
-      padding: 2px 0;
-
-      .cell {
-        padding-left: 4px;
-        padding-right: 4px;
-      }
-
-      .el-button--mini,
-      .el-link {
-        font-size: 12px;
-      }
-    }
-  }
-
-  /* Element UI 表格排序图标 */
-  & .el-table {
-    .caret-wrapper {
-      display: inline-flex;
-      flex-direction: row-reverse;
-      align-items: center;
-      width: 16px;
-      height: 16px;
-      line-height: 16px;
-      vertical-align: middle;
-    }
-
-    .sort-caret.ascending,
-    .sort-caret.descending {
-      width: 8px;
-      height: 16px;
-      border: none;
-      font-style: normal;
-      position: static;
-
-      &:hover {
-        color: $--color-primary-light-6;
-      }
-
-      &:before {
-        content: '\e61c';
-        font-family: 'core-lib-iconfont';
-        font-size: 12px;
-        line-height: 12px;
-        position: relative;
-        right: 3px;
-        bottom: 1px;
-      }
-    }
-
-    .sort-caret.descending:before {
-      content: '\e61d';
-      position: relative;
-      right: 1px;
-      bottom: 1px;
-    }
-
-    .ascending .sort-caret.ascending,
-    .descending .sort-caret.descending {
-      color: $--color-primary;
-    }
-  }
-
-  /* 过滤器样式 */
-  & .el-table-filter__bottom {
-    text-align: center;
-  }
-
-  & .el-table__column-filter-trigger {
-    height: 16px;
-    line-height: 16px;
-    vertical-align: middle;
-    position: relative;
-    bottom: 1px;
-
-    i {
-      font-size: 16px;
-      transform: scale(1);
-    }
-  }
-
-  & .table-header-popover.el-popover {
-    padding: 16px;
-  }
-
-  /* 附件上传hover颜色 */
-  & .base-table_default {
-    .el-table__body .hover-active:hover > td {
-      background-color: #ff3c2f10 !important;
-    }
-  }
-
-  /* vxe-table 样式 */
-  & .vxe-table .vxe-cell--sort {
-    display: inline-flex !important;
-    flex-direction: row-reverse !important;
-    align-items: center !important;
-    width: 16px !important;
-    height: 16px !important;
-    line-height: 16px !important;
-    vertical-align: middle !important;
-    cursor: pointer;
-
-    .vxe-sort--asc-btn,
-    .vxe-sort--desc-btn {
-      width: 6px;
-      height: 10px;
-      color: #333;
-      border: none;
-      font-style: normal;
-      position: static;
-    }
-  }
-
-  & .vxe-cell--wrapper {
-    justify-content: center !important;
-  }
-
-  & .vxe-header--row {
-    color: #333;
-    background-color: #f5f5f5;
-  }
-
-  & .vxe-cell--filter .vxe-filter--btn {
-    color: #666;
-    font-weight: $--font-weight-primary;
-    cursor: pointer;
-    font-size: 16px;
-  }
-
-  & .is--filter-active .vxe-cell--filter .vxe-filter--btn {
-    color: $--color-primary;
-  }
-
-  & .is--filter-active .vxe-cell--title {
-    color: $--color-primary;
-  }
-
-  & .vxe-table--render-default.size--small {
-    font-size: 14px !important;
-  }
-
-  & .vxe-table--render-default.size--mini {
-    font-size: 14px !important;
-  }
-
-  & .vxe-header--row th,
-  & th.vxe-header--column {
-    position: relative;
-    font-weight: $--font-weight-primary;
-  }
-
-  & .vxe-table--tooltip-wrapper {
-    z-index: 9999 !important;
-  }
-
-  &
-    .cell-default-set--
-    .vxe-table--body-wrapper
-    .vxe-body--row
-    .vxe-body--column
-    .vxe-cell
-    .vxe-cell--label:empty::before {
-    content: '--';
-  }
-
-  & .n20-table-pro.vxe-table--render-default {
-    font-family: PingFang SC, Microsoft YaHei, Arial, sans-serif !important;
-    color: #333;
-  }
-
-  & .vxe-table-custom-wrap.vxe-body--column.col--ellipsis:not(.col--actived) > .vxe-cell,
-  & .vxe-table--render-default .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis:not(.col--actived) > .vxe-cell,
-  & .vxe-table--render-default .vxe-table-custom-wrap.vxe-header--column.col--ellipsis:not(.col--actived) > .vxe-cell {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: wrap !important;
-  }
-
-  & .vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-body--column.col--ellipsis > .vxe-cell,
-  & .vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis > .vxe-cell,
-  & .vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-header--column.col--ellipsis > .vxe-cell {
-    max-height: 100%;
-  }
-
-  & .vxe-header--column {
-    .vxe-cell {
-      justify-content: center !important;
-    }
-  }
-
-  & .el-table th.el-table__cell > .cell {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
-
-/* 为没有wrapper的旧版本组件添加兼容样式 */
-/* 这些全局样式会被v3版本的wrapper样式覆盖，实现兼容 */
 .el-table--small {
   font-size: 14px;
 }
@@ -281,6 +40,7 @@
     .cell {
       padding-left: 4px;
       padding-right: 4px;
+      // line-height: 18px;
     }
 
     .el-button--mini,
@@ -290,8 +50,8 @@
   }
 }
 
-/* Element UI 表格排序图标 */
 .el-table {
+  /* 排序 */
   .caret-wrapper {
     display: inline-flex;
     flex-direction: row-reverse;
@@ -338,7 +98,7 @@
   }
 }
 
-/* 过滤器样式 */
+/* 过滤 */
 .el-table-filter__bottom {
   text-align: center;
 }
@@ -367,7 +127,6 @@
   }
 }
 
-/* vxe-table 样式 */
 .vxe-table .vxe-cell--sort {
   display: inline-flex !important;
   flex-direction: row-reverse !important;
@@ -377,7 +136,7 @@
   line-height: 16px !important;
   vertical-align: middle !important;
   cursor: pointer;
-
+  padding-right: 4px !important;
   .vxe-sort--asc-btn,
   .vxe-sort--desc-btn {
     width: 6px;
@@ -417,6 +176,12 @@
   font-size: 14px !important;
 }
 
+.vxe-header--row th,
+th.vxe-header--column {
+  position: relative;
+  font-weight: $--font-weight-primary;
+}
+
 .vxe-table--tooltip-wrapper {
   z-index: 9999 !important;
 }
@@ -444,13 +209,12 @@
   max-height: 100%;
 }
 
-.el-table th.el-table__cell > .cell {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+.vxe-header--column {
+  .vxe-cell {
+    justify-content: center !important;
+  }
 }
 
-/* TableSetSize 组件样式 - 仅在v2版本中引入 */
 @import '../../components/TableSetSize/style.scss';
 
 .el-table-set-size-item {
@@ -463,14 +227,8 @@
   }
 }
 
-@import '../../components/TableSetSize/style.scss';
-
-.el-table-set-size-item {
-  .icon-mini {
-    background-image: url('../../components/TableSetSize/small.png');
-  }
-
-  .icon-mini {
-    background-image: url('../../components/TableSetSize/mini.png');
-  }
+.el-table th.el-table__cell > .cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }

package/src/assets/css/v3/secondary-tab.scss

@@ -1,4 +1,6 @@
 .n20-secondary-tab__wrapper {
+  height: 39px;
+  line-height: 39px;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -7,7 +9,7 @@
     .el-tabs__header {
       margin-bottom: 0;
     }
-   .el-tabs__nav-wrap {
+    .el-tabs__nav-wrap {
       overflow: visible;
     }
     .el-tabs__nav-scroll {
@@ -33,7 +35,7 @@
           height: 2px;
           background-color: $--color-primary;
           display: block;
-          margin-top: 3px;
+          margin-top: 4px;
         }
       }
       &.is-disabled {
@@ -102,8 +104,7 @@
   line-height: 22px !important;
   padding: 8px 12px !important;
   border-radius: 4px !important;
-  box-shadow: 0 6px 16px -8px rgba(0, 0, 0, 0.08),
-    0 9px 28px 0 rgba(0, 0, 0, 0.05),
+  box-shadow: 0 6px 16px -8px rgba(0, 0, 0, 0.08), 0 9px 28px 0 rgba(0, 0, 0, 0.05),
     0 12px 48px 16px rgba(0, 0, 0, 0.03) !important;
   border: none !important;
 

package/src/assets/css/v3/table.scss

@@ -340,13 +340,13 @@
       position: static;
     }
   }
-
-  .vxe-header--row {
+  .vxe-header--row th,
+  th.vxe-header--column {
     color: var(--text-1, #1d2129);
     font-family: 'PingFang SC';
     font-size: 14px;
     font-style: normal;
-    font-weight: 500;
+    font-weight: 700;
     line-height: 22px;
     background-color: #f5f5f5;
   }
@@ -389,7 +389,12 @@
     z-index: 9999 !important;
   }
 
-  .cell-default-set-- .vxe-table--body-wrapper .vxe-body--row .vxe-body--column .vxe-cell .vxe-cell--label:empty::before {
+  .cell-default-set--
+    .vxe-table--body-wrapper
+    .vxe-body--row
+    .vxe-body--column
+    .vxe-cell
+    .vxe-cell--label:empty::before {
     content: '--';
   }