n20-common-lib 2.6.65 → 2.7.0-beta

package/package.json

@@ -1,26 +1,25 @@
 {
   "name": "n20-common-lib",
-  "version": "2.6.65",
+  "version": "2.7.0-beta",
   "private": false,
+  "main": "src/index.js",
   "scripts": {
+    "dev": "vue-cli-service serve --doc",
+    "build:docs": "vue-cli-service build --doc",
     "serve": "vue-cli-service serve",
+    "serve:theme": "vue-cli-service serve --testTheme",
+    "test": "vue-cli-service serve --test",
     "build": "node versionInfo.js && npm run build:css && vue-cli-service build --testTheme",
-    "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
+    "info": "node versionInfo.js",
     "build:Jenkins_1": "vue-cli-service build --serverConfig ./server-config-jenkins.jsonc",
-    "build:css": "node build_css",
-    "build:doc": "node versionInfo.js && vue-cli-service build --testTheme",
-    "build:docs": "vue-cli-service build --doc",
     "build:gzip": "vue-cli-service build --gzip",
-    "build:js": "vue-cli-service build --formats umd-min --target lib src/index.js --name index --dest lib  --analy",
     "build:report": "vue-cli-service build --analy",
-    "dev": "vue-cli-service serve --doc",
-    "getI18n": "node ./node_modules/nstc-get-i18n",
-    "info": "node versionInfo.js",
-    "serve:theme": "vue-cli-service serve --testTheme",
-    "test": "vue-cli-service serve --test"
+    "build:css": "node build_css",
+    "build:js": "vue-cli-service build --formats umd-min --target lib src/index.js --name index --dest lib  --analy",
+    "build:doc": "node versionInfo.js && vue-cli-service build --testTheme",
+    "getI18n": "node ./node_modules/nstc-get-i18n"
   },
-  "main": "src/index.js",
   "files": [
     "src/_qiankun",
     "src/assets",
@@ -60,22 +59,17 @@
     "qrcode": "*",
     "resize-detector": "*",
     "strip-json-comments": "*",
-    "vuedraggable": "*",
     "v-viewer": "1.6.4",
-    "xe-utils": "^3.5.11"
+    "vuedraggable": "*"
   },
   "devDependencies": {
     "@babel/plugin-proposal-optional-chaining": "^7.14.5",
     "@babel/plugin-transform-flow-comments": "^7.14.5",
     "@vue/cli-plugin-babel": "~4.5.0",
     "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-plugin-unit-jest": "^5.0.8",
     "@vue/cli-service": "~4.5.0",
     "@vue/compiler-dom": "^3.2.47",
-    "@vue/test-utils": "^1.1.3",
-    "@vue/vue2-jest": "^27.0.0-alpha.2",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.0.6",
     "babel-plugin-component": "^1.1.1",
     "clipboard": "^2.0.11",
     "compression-webpack-plugin": "^3.1.0",
@@ -89,7 +83,6 @@
     "file-saver": "^2.0.5",
     "fuse.js": "^6.6.2",
     "html-webpack-tags-plugin": "^2.0.17",
-    "jest": "^27.0.5",
     "jszip": "^3.10.0",
     "lodash": "^4.17.21",
     "md2vue-loader": "file:./md2vue-loader",
@@ -110,12 +103,12 @@
     "vue": "^2.6.11",
     "vue-cli-plugin-axios": "~0.0.4",
     "vue-grid-layout": "^2.3.12",
-    "vue-jest": "^3.0.7",
     "vue-router": "^3.5.2",
     "vue-template-compiler": "^2.6.11",
     "vuex": "^3.6.2",
     "vxe-table": "^3.6.17",
     "webpack-bundle-analyzer": "^3.9.0",
+    "xe-utils": "^3.5.11",
     "xlsx": "0.14.1",
     "xlsx-style": "^0.8.13"
   },

package/src/assets/css/cl-file-upload-table.scss

@@ -1,4 +1,5 @@
-.file-upload-table {
+.file-upload-table,
+.n20-ElectronicArchive {
   .el-table {
     border-top: $--tab-border-line;
     border-left: $--tab-border-line;
@@ -29,4 +30,10 @@
   .el-upload {
     display: block;
   }
+}
+
+.electronicArchive-messageBox {
+  .el-message-box__btns {
+    margin-top: 0;
+  }
 }

package/src/assets/css/cl-layout-header.scss

@@ -6,6 +6,14 @@ $--header-color: #3d4a57;
     height: 26px;
   }
 
+  .header_change_system_box {
+    &:hover {
+      background-color: #f5f5f5;
+      padding: 4px;
+      border-radius: $--border-radius-base;
+    }
+  }
+
   .header-color {
     color: var(--header-color, $--header-color);
   }
@@ -270,4 +278,19 @@ $--header-color: #3d4a57;
   margin-left: 34px;
   line-height: 20px;
   color: #333333;
+}
+
+.header-menu-drawer.el-drawer.ttb {
+  top: 48px;
+  left: 190px;
+  width: calc(100% - 190px);
+
+  .header_flex-base {
+    flex-basis: 33.33%;
+  }
+
+  .header_menu_box {
+    padding-top: 48px;
+    padding-left: 105px;
+  }
 }

package/src/assets/css/cl-message.scss

@@ -57,6 +57,60 @@
   }
 }
 
+.ElectronicArchive_msgboxPor.el-message-box {
+  box-sizing: border-box;
+  padding: 32px 32px 24px;
+
+  .el-message-box__header {
+    padding: 0;
+    margin-bottom: 12px;
+
+    .n20-icon-xinxi {
+      color: #ffbf00;
+    }
+
+    .el-message-box__status.el-icon-warning {
+      color: #ffbf00;
+    }
+  }
+
+  .el-message-box__content {
+    padding: 0;
+    margin-top: 12px;
+    margin-bottom: 12px;
+  }
+
+  .el-message-box__btns {
+    margin-top: 0;
+    padding-left: 0;
+    padding-right: 0;
+    display: flex;
+    justify-content: center;
+    flex-direction: row-reverse;
+
+    .el-button.el-button--default:hover {
+      color: var(--color-primary);
+      background: #ffffff;
+      border-color: var(--color-primary);
+    }
+
+    .el-button.el-button--primary:hover {
+      background: var(--color-primary-hover);
+      color: #fff;
+      border-color: var(--color-primary-hover);
+    }
+
+    & .el-button+.el-button {
+      margin-left: 0;
+      margin-right: 16px;
+    }
+  }
+
+  .el-message-box__headerbtn {
+    top: -15px;
+    right: -15px;
+  }
+}
 .header-show-icon {
   .el-message-box__title {
     justify-content: flex-start;
@@ -157,4 +211,4 @@
 
 .el-message-box__status.el-icon-info {
   color: $--messagebox-warning-color;
-}
+}

package/src/assets/css/cl-pagination.scss

@@ -1,45 +1,35 @@
 .n20-pagination-1 {
   display: inline-block;
   padding-right: 5px;
-
-  >* {
+  > * {
     vertical-align: middle;
   }
-
   .el-pagination {
     display: inline-block;
   }
-
   .btn-prev,
   .btn-next {
     padding-left: 6px;
     padding-right: 6px;
     border: 1px solid $--border-color-base;
-
     &:not([disabled]):hover {
       border-color: $--color-primary;
     }
   }
-
   .btn-next {
     margin-left: 6px;
   }
-
   .el-pagination {
     padding: 1px 5px;
   }
 }
-
 .n20-pagination-jumper-1 {
   width: 36px;
-  text-align: center;
   margin-left: 6px;
   margin-right: 6px;
-
   &.is-without-controls {
     .el-input__inner {
       height: 26px;
-      text-align: center;
       line-height: 26px;
       padding-left: 4px;
       padding-right: 4px;
@@ -47,23 +37,19 @@
     }
   }
 }
-
 .n20-pagination-sizes-1 {
   .el-radio-button__inner {
     border-radius: 2px !important;
     border: 1px solid $--border-color-base;
     box-shadow: none;
   }
-
-  .el-radio-button__orig-radio:checked+.el-radio-button__inner {
+  .el-radio-button__orig-radio:checked + .el-radio-button__inner {
     border-color: $--color-primary;
   }
 }
-
 .n20-pagination-usersizes-1 {
   width: 52px;
   vertical-align: middle;
-
   &.is-without-controls {
     .el-input__inner {
       height: 26px;
@@ -73,7 +59,6 @@
       border-radius: 2px;
     }
   }
-
   &.is-active {
     .el-input__inner {
       border-color: $--border-color-base;
@@ -83,81 +68,66 @@
 
 .n20-pagination {
   display: inline-block;
-
-  >* {
+  > * {
     vertical-align: middle;
   }
-
   .el-pagination {
     display: inline-block;
     padding-right: 0;
   }
-
   .btn-prev,
   .btn-next {
     padding-left: 6px;
     padding-right: 6px;
     border: 1px solid $--border-color-base;
     border-radius: $--border-radius-small;
-
     &:not([disabled]):hover {
       border-color: $--color-primary;
     }
   }
-
   .btn-next {
     margin-left: 4px;
   }
-
   .el-input__inner {
     height: 26px;
     line-height: 26px;
   }
-
   .el-pagination__sizes {
     margin-right: 6px;
-
     .el-input {
       width: 85px;
       margin-left: 0;
       margin-right: 0;
     }
-
     .el-input .el-input__inner {
       padding-right: 20px;
     }
-
     .el-select__caret {
       line-height: 25px;
       position: relative;
       top: -2px;
     }
   }
-
   .el-pagination__jump {
     margin-left: 0;
   }
 }
-
 .n20-pagination-total,
 .n20-pagination-no {
   min-width: initial !important;
 }
-
 .n20-pagination-total {
   margin-left: 4px;
   margin-right: 4px;
   font-weight: normal;
 }
-
 .n20-pagination-no {
   color: $--color-primary;
 }
-
 .el-pagination__sizes-popper {
   .el-select-dropdown__item {
     padding-left: 12px;
     padding-right: 12px;
     text-align: center;
   }
-}
+}

package/src/assets/css/el-table.scss

@@ -51,6 +51,7 @@
 }
 
 .el-table {
+
   /* 排序 */
   .caret-wrapper {
     display: inline-flex;
@@ -120,6 +121,13 @@
   padding: 16px;
 }
 
+/* 附件上传hover颜色 */
+.base-table_default {
+  .el-table__body .hover-active:hover>td {
+    background-color: #FF3C2F10 !important;
+  }
+}
+
 .vxe-table .vxe-cell--sort {
   display: inline-flex !important;
   flex-direction: row-reverse !important;
@@ -188,16 +196,17 @@ th.vxe-header--column {
   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 {
+.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 {
+
+.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%;
 }
 
@@ -217,4 +226,4 @@ th.vxe-header--column {
   .icon-mini {
     background-image: url('../../components/TableSetSize/mini.png');
   }
-}
+}

package/src/assets/css/filter.scss

@@ -8,7 +8,7 @@
   display: flex;
   align-items: center;
   flex: 1;
-  padding: 8px 0;
+  padding: 8px;
 
   &-item.n20-advanced-filter-active {
     border-color: #b3d0ff;
@@ -68,10 +68,6 @@
       max-width: 380px;
     }
 
-    .n20-date-editor .el-input__prefix {
-      display: none;
-    }
-
     .el-input,
     .el-input__inner {
       border: none;

package/src/assets/css/font-icon.scss

@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+
 [class^='n20-icon-'],
 [class*=' n20-icon-'] {
   @extend .n20-icon-;

package/src/assets/css/normalize.scss

@@ -260,7 +260,7 @@ iframe {
 .b-center {
   text-align: center;
 
-  & > * {
+  &>* {
     display: inline-block;
     vertical-align: bottom;
   }
@@ -269,7 +269,7 @@ iframe {
 .b-vertical {
   font-size: 0;
 
-  & > * {
+  &>* {
     vertical-align: middle;
     display: inline-block;
     font-size: 14px;
@@ -320,12 +320,22 @@ iframe {
   flex-direction: column;
 }
 
-.flex-box > *,
-.flex-column > * {
+.flex-box>*,
+.flex-column>* {
   flex: none;
 }
 
+
+
 .flex {
+  &-wrap {
+    flex-wrap: wrap;
+  }
+
+  &-nowrap {
+    flex-wrap: nowrap;
+  }
+
   &-v {
     align-items: center;
   }
@@ -455,6 +465,7 @@ iframe {
 /* 边框
 -------------- */
 .bd {
+
   &-none,
   &-0 {
     border: none !important;
@@ -615,6 +626,7 @@ iframe {
 .auto-width-input {
   width: fit-content;
 }
+
 .width-auto {
   width: auto !important;
 }
@@ -800,6 +812,7 @@ $list: 45, 60, 80, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 2
 }
 
 @keyframes ping {
+
   75%,
   100% {
     transform: scale(2);
@@ -808,6 +821,7 @@ $list: 45, 60, 80, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 2
 }
 
 @keyframes pulse {
+
   0%,
   100% {
     opacity: 1;
@@ -819,6 +833,7 @@ $list: 45, 60, 80, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 2
 }
 
 @keyframes bounce {
+
   0%,
   100% {
     transform: translateY(-25%);
@@ -829,4 +844,4 @@ $list: 45, 60, 80, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 2
     transform: translateY(0);
     animation-timing-function: cubic-bezier(0, 0, 0.2, 1);
   }
-}
+}

package/src/assets/getJsonc.js

@@ -4,8 +4,8 @@ import realUrl from './realUrl'
 /* 前端(内存)缓存 */
 const jsoncs = {}
 
-export default function getJsonc(url, sync,rest) {
-  const _url = realUrl(url, rest)
+export default function getJsonc(url, sync) {
+  const _url = realUrl(url)
   if (sync) {
     if (jsoncs[url + '?sync']) {
       return jsoncs[url + '?sync']