n20-common-lib 2.7.8 → 2.7.10

package/package.json

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

package/src/assets/css/_coreLib.scss

@@ -1,50 +1,50 @@
 /* AdvancedFilter */
 @import './advanced-filter.scss';
-@import './cl-nav-menu.scss';
+@import './nav-menu.scss';
 @import './rootvar.scss';
 @import './font-icon.scss';
 
-@import './el-button.scss';
-@import './el-table.scss';
+@import './button.scss';
+@import './table.scss';
 
 @import './title-pop.scss';
-@import './cl-form-item.scss';
-@import './cl-approve-card.scss';
-@import './cl-expandable.scss';
-@import './cl-expandable-pane.scss';
-@import './cl-more-tab.scss';
-@import './cl-pagination.scss';
-@import './cl-secondary-tab.scss';
-@import './cl-statis.scss';
-@import './cl-step.scss';
-@import './cl-suspend.scss';
-@import './cl-tertiary-tab.scss';
-@import './cl-upload.scss';
-@import './cl-drag-list.scss';
-@import './cl-sifting.scss';
-@import './cl-empty.scss';
-@import './cl-file-upload-table.scss';
-@import './cl-footer-box.scss';
+@import './form-item.scss';
+@import './approve-card.scss';
+@import './expandable.scss';
+@import './expandable-pane.scss';
+@import './more-tab.scss';
+@import './pagination.scss';
+@import './secondary-tab.scss';
+@import './statis.scss';
+@import './step.scss';
+@import './suspend.scss';
+@import './tertiary-tab.scss';
+@import './upload.scss';
+@import './drag-list.scss';
+@import './sifting.scss';
+@import './empty.scss';
+@import './file-upload-table.scss';
+@import './footer-box.scss';
 @import './filter.scss';
-@import './cl-worn-pagination.scss';
+@import './worn-pagination.scss';
 /* Dialog */
 @import './dialog.scss';
-@import './cl-layout.scss';
-@import './cl-login-temporary.scss';
-@import './cl-showcolumn.scss';
-@import './cl-message.scss';
-@import './cl-general-card.scss';
-@import './cl-anchor.scss';
-@import './cl-flow-step.scss';
+@import './layout.scss';
+@import './login.scss';
+@import './show-column.scss';
+@import './message.scss';
+@import './general-card.scss';
+@import './anchor.scss';
+@import './flow-step.scss';
 @import './umy-table/u-table.scss';
 @import './umy-table/u-tree-table.scss';
 @import './umy-table/ux-grid.scss';
-@import './cl-tree.scss';
+@import './tree.scss';
 @import '../../plugins/Print/print.scss';
 @import './select.scss';
 @import './plain-text.scss';
-@import './cl-date-quarter.scss';
+@import './date-quarter.scss';
 @import './work-card.scss';
 /* 临时引入 */
 @import '../../components/ChildRange/style.scss';
-@import '../../components/PageHeader/style.scss';
+@import '../../components/PageHeader/style.scss';

package/src/assets/css/{el-button.scss → button.scss}

@@ -17,35 +17,39 @@ $--button-margin-left: 6px;
   min-width: 72px;
 }
 
-.el-button + .el-button {
+.el-button+.el-button {
   margin-left: $--button-margin-left;
 }
 
-.el-button + .el-dropdown {
+.el-button+.el-dropdown {
   margin-left: $--button-margin-left;
 }
 
-.el-button--mini + .el-button--mini {
+.el-button--mini+.el-button--mini {
   margin-left: $--button-margin-left;
 }
 
 .el-button[onlyicon] {
+
   &.el-button--default,
   &.el-button--medium,
   &.el-button--small {
     padding: 8px;
   }
+
   &.el-button--mini {
     padding: 5px;
   }
 }
 
 .el-button--info {
+
   &,
   &:focus {
     background-color: $--color-info;
     border-color: $--color-info;
   }
+
   &:hover {
     background: $--color-info-hover;
     border-color: $--color-info-hover;
@@ -53,11 +57,13 @@ $--button-margin-left: 6px;
 }
 
 .el-button--primary {
+
   &,
   &:focus {
     background-color: $--color-primary;
     border-color: $--color-primary;
   }
+
   &:hover {
     background: $--color-primary-hover;
     border-color: $--color-primary-hover;
@@ -65,11 +71,13 @@ $--button-margin-left: 6px;
 }
 
 .el-button--success {
+
   &,
   &:focus {
     background-color: $--color-success;
     border-color: $--color-success;
   }
+
   &:hover {
     background: $--color-success-hover;
     border-color: $--color-success-hover;
@@ -77,11 +85,13 @@ $--button-margin-left: 6px;
 }
 
 .el-button--warning {
+
   &,
   &:focus {
     background-color: $--color-warning;
     border-color: $--color-warning;
   }
+
   &:hover {
     background: $--color-warning-hover;
     border-color: $--color-warning-hover;
@@ -89,11 +99,13 @@ $--button-margin-left: 6px;
 }
 
 .el-button--danger {
+
   &,
   &:focus {
     background-color: $--color-danger;
     border-color: $--color-danger;
   }
+
   &:hover {
     background: $--color-danger-hover;
     border-color: $--color-danger-hover;
@@ -101,12 +113,14 @@ $--button-margin-left: 6px;
 }
 
 .el-button.is-plain {
+
   &,
   &:focus {
     color: $--color-text-primary;
     background: $--color-white;
     border-color: $--button-default-border-color;
   }
+
   &:hover {
     color: $--color-primary;
     background: $--color-white;
@@ -115,12 +129,14 @@ $--button-margin-left: 6px;
 }
 
 .el-button--warning.is-plain {
+
   &,
   &:focus {
     color: $--color-warning;
     background: $--color-white;
     border-color: $--button-default-border-color;
   }
+
   &:hover {
     color: $--color-warning;
     background: $--color-white;
@@ -129,12 +145,14 @@ $--button-margin-left: 6px;
 }
 
 .el-button--danger.is-plain {
+
   &,
   &:focus {
     color: $--color-danger;
     background: $--color-white;
     border-color: $--button-default-border-color;
   }
+
   &:hover {
     color: $--color-danger;
     background: $--color-white;
@@ -143,6 +161,7 @@ $--button-margin-left: 6px;
 }
 
 .el-button--text {
+
   &,
   &:focus {
     color: $--color-primary;
@@ -153,8 +172,10 @@ $--button-margin-left: 6px;
     color: $--color-primary-hover;
   }
 }
+
 .el-button--default.is-plain {
   &.is-disabled {
+
     &,
     &:hover,
     &:focus,
@@ -168,6 +189,7 @@ $--button-margin-left: 6px;
 
 .el-button--danger.is-plain {
   &.is-disabled {
+
     &,
     &:hover,
     &:focus,
@@ -182,6 +204,7 @@ $--button-margin-left: 6px;
 
 .el-button.el-button--text {
   &.is-disabled {
+
     &,
     &:hover,
     &:focus,
@@ -203,7 +226,9 @@ $--button-margin-left: 6px;
   &:hover {
     color: $--color-primary-hover;
   }
+
   &.is-disabled {
+
     &,
     &:hover,
     &:focus,
@@ -215,4 +240,4 @@ $--button-margin-left: 6px;
 
 .el-button-dropdown-item {
   margin-left: 27px !important;
-}
+}

package/src/assets/css/{cl-layout.scss → layout.scss}

@@ -14,6 +14,7 @@ body {
     .tabs-nav-wrap {
       left: $--aside-collapse-width;
     }
+
     .content-wrap {
       left: $--aside-collapse-width;
     }
@@ -43,11 +44,13 @@ body {
   overflow-y: overlay;
   overflow-x: hidden;
 }
+
 /* 滚动条样式 */
 .layout-aside::-webkit-scrollbar {
   display: none !important;
 }
-@import './cl-layout-aside.scss';
+
+@import './layout-aside.scss';
 
 .header-wrap {
   box-sizing: border-box;
@@ -65,7 +68,8 @@ body {
     opacity: 1;
   }
 }
-@import './cl-layout-header.scss';
+
+@import './layout-header.scss';
 
 .tabs-nav-wrap {
   box-sizing: border-box;
@@ -81,7 +85,8 @@ body {
 
   overflow-y: hidden;
 }
-@import './cl-layout-tabs.scss';
+
+@import './layout-tabs.scss';
 
 .content-wrap {
   box-sizing: border-box;
@@ -98,10 +103,11 @@ body {
 
   transition: left 0.3s ease-in;
 }
-@import './cl-layout-content.scss';
 
-.workplace-card > [data-version],
-.workplace-card > [data-version] > div,
-.workplace-card > [data-version] > div > div {
+@import './layout-content.scss';
+
+.workplace-card>[data-version],
+.workplace-card>[data-version]>div,
+.workplace-card>[data-version]>div>div {
   height: 100%;
-}
+}

package/src/assets/css/{cl-nav-menu.scss → nav-menu.scss}

@@ -2,4 +2,4 @@
   height: 1em;
   background: center no-repeat;
   background-size: 1em 1em;
-}
+}

package/src/assets/css/{el-table.scss → table.scss}

@@ -191,7 +191,7 @@ th.vxe-header--column {
   content: '--';
 }
 
-.vxe-table--render-default {
+.n20-table-pro.vxe-table--render-default {
   font-family: PingFang SC, Microsoft YaHei, Arial, sans-serif !important;
   color: #333;
 }

package/src/assets/css/work-card.scss

@@ -1,21 +1,26 @@
 .work-card {
   height: 100%;
+
   &-title {
     font-weight: 500;
   }
+
   &-more.el-link.el-link--default {
     color: $--color-text-secondary;
   }
+
   .el-table td.el-table__cell,
   .el-table th.el-table__cell.is-leaf {
     border-bottom: none;
   }
+
   .el-table td.el-table__cell .cell {
     .el-button--primary {
       color: var(--color-primary);
       background-color: var(--color-primary-light-9);
       border-color: var(--color-primary-light-9);
     }
+
     .el-button--primary:active,
     .el-button--primary:focus,
     .el-button--primary:hover {
@@ -23,6 +28,7 @@
       border-color: var(--color-primary-light-7);
     }
   }
+
   .el-table--border:after,
   .el-table--group:after,
   .el-table:before {
@@ -32,9 +38,11 @@
     z-index: 1;
   }
 }
+
 .work-card ::v-deep .el-badge__content {
   line-height: 14px;
 }
+
 .work-card .el-badge__content.is-fixed {
   position: absolute;
   top: 0;
@@ -46,4 +54,4 @@
   color: #cacaca;
   padding-bottom: 80px;
   margin-top: -16px;
-}
+}

package/src/components/TablePro/index.vue

@@ -6,7 +6,7 @@
       :align="'center'"
       :data="data"
       :height="height"
-      :class="{ 'cell-default-set--': cellDefault }"
+      :class="[{ 'cell-default-set--': cellDefault }, 'n20-table-pro']"
       :checkbox-config="{
         checkField: 'checked',
         checkMethod: forbidSelect,

package/src/components/Upload/uploadMsg.vue

@@ -176,7 +176,7 @@ export default {
       errorListC: [],
       page: {
         current: 1,
-        pageSize: 6,
+        pageSize: 20,
         total: 0
       },
       index: 0