n20-common-lib 2.5.0-beta.2 → 2.5.0-beta.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.0-beta.2",
+  "version": "2.5.0-beta.20",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -54,6 +54,7 @@
     "lz-string": "^1.4.4",
     "normalize.css": "^8.0.1",
     "numerify": "*",
+    "ofd.js": "^1.4.1",
     "panzoom": "*",
     "qrcode": "*",
     "resize-detector": "*",
@@ -62,7 +63,6 @@
     "vuedraggable": "*"
   },
   "devDependencies": {
-    "element-ui": "^2.15.14",
     "@babel/plugin-proposal-optional-chaining": "^7.14.5",
     "@babel/plugin-transform-flow-comments": "^7.14.5",
     "@vue/cli-plugin-babel": "~4.5.0",
@@ -76,6 +76,7 @@
     "copy-webpack-plugin": "^6.4.1",
     "core-js": "^3.6.5",
     "echarts": "^5.3.3",
+    "element-ui": "^2.15.14",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
     "exceljs": "^4.3.0",

package/src/assets/css/_coreLib.scss

@@ -23,7 +23,7 @@
 @import './cl-empty.scss';
 @import './cl-file-upload-table.scss';
 @import './cl-footer-box.scss';
-@import './cl-filter.scss';
+@import './filter.scss';
 @import './cl-worn-pagination.scss';
 @import './cl-dialog.scss';
 @import './cl-layout.scss';
@@ -41,7 +41,7 @@
 @import './select.scss';
 @import './plain-text.scss';
 @import './cl-date-quarter.scss';
-@import './cl-advanced-filter.scss';
+
 /* 临时引入 */
 @import '../../components/ChildRange/style.scss';
 @import '../../components/PageHeader/style.scss';

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

@@ -111,4 +111,9 @@
     line-height: 28px;
     border-bottom: none;
   }
+}
+
+.el-loading-mask {
+  z-index: 99999;
+  /* 自定义层级值 */
 }

package/src/assets/css/cl-form-item.scss

@@ -1,7 +1,7 @@
 $--s: 1024px;
 $--m: 1600px;
 $--l: 1920px;
-$--input-max: 224px;
+$--input-max: 300px;
 
 .el-form-item[span],
 .el-form-item[span-s],
@@ -748,3 +748,10 @@ $--input-max: 224px;
 .el-form-item__label {
   color: $--color-text-primary;
 }
+
+.n20-approval-Button {
+  .el-form-item--small .el-form-item__content,
+  .el-form-item--small .el-form-item__label {
+    line-height: 1.5;
+  }
+}

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

@@ -1,6 +1,6 @@
 .content-box {
   box-sizing: border-box;
-  margin: 0 4px 4px 4px;
+  margin: 0 8px 8px 8px;
   padding: 8px;
   border-radius: 0 0 6px 6px;
   height: var(--client-height);
@@ -8,7 +8,7 @@
   overflow: auto;
 
   &.element-doc {
-    margin: 0 4px 4px 4px;
+    margin: 0 8px 8px 8px;
     padding: 8px;
     height: var(--client-height);
     overflow: auto;

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

@@ -2,7 +2,7 @@ $--item-margin: 0;
 $--item-radius: 4px;
 $--layout-margin-top: 1px;
 $--item-hover-padding: 12px;
-$--tabs-item-margin: 4px;
+$--tabs-item-margin: 8px;
 
 .tabs-nav-wrap {
   &.el-tabs--card > .el-tabs__header {

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

@@ -1,5 +1,12 @@
 .cl-tree {
   &-item {
-    min-width: 260px;
+    width: 100%;
+    min-width: 450px;
+    &-label {
+      max-width: 320px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
   }
 }

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

@@ -163,6 +163,10 @@ th.vxe-header--column {
 .cell-default-set-- .vxe-table--body-wrapper .vxe-body--row .vxe-body--column .vxe-cell .vxe-cell--label:empty::before {
   content: '--';
 }
+.vxe-table--render-default {
+  font-family: PingFang SC, Microsoft YaHei, Arial, sans-serif !important;
+  color: #333;
+}
 @import '../../components/TableSetSize/style.scss';
 .el-table-set-size-item {
   .icon-mini {

package/src/assets/css/filter.scss

@@ -0,0 +1,121 @@
+.n20-filter {
+  max-height: 380px;
+  overflow-y: auto;
+}
+
+.n20-advanced-filter {
+  position: relative;
+  display: flex;
+  align-items: center;
+  flex: 1;
+  padding: 8px;
+  &-item.n20-advanced-filter-active {
+    border-color: #b3d0ff;
+    background: #e9f2ff !important;
+  }
+  &-body {
+    .el-form-item,
+    .el-form-item--small.el-form-item {
+      margin-bottom: 10px;
+    }
+    .el-form-item__content {
+      display: inline-block;
+      vertical-align: middle;
+      width: auto;
+    }
+  }
+
+  &-item {
+    box-sizing: border-box;
+    position: relative;
+    display: inline-block;
+    vertical-align: middle;
+    max-width: 442px !important;
+    min-width: 120px;
+    margin-right: 8px;
+    border: 1px solid $--border-color-base;
+    padding: 0 4px 0 8px;
+    border-radius: 4px;
+    white-space: nowrap;
+    cursor: pointer;
+    .el-form-item__label {
+      padding: 0;
+      display: inline-block;
+      vertical-align: middle;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      margin-right: 4px;
+    }
+
+    .n20-date-editor.el-input--prefix {
+      max-width: 166px;
+    }
+    .el-range-editor.el-input__inner {
+      min-width: 168px;
+      max-width: 224px;
+      .el-range-input {
+        background-color: transparent;
+      }
+    }
+
+    .el-input,
+    .el-input__inner {
+      border: none;
+      width: 100%;
+      background-color: transparent;
+    }
+    .el-input__inner:active,
+    .el-input__inner:focus {
+      box-shadow: none;
+      border: none;
+      border-color: #fff;
+    }
+
+    .el-checkbox-group {
+      height: 32px;
+      line-height: 32px;
+      vertical-align: middle;
+      padding: 0 10px;
+    }
+    .el-radio-group {
+      padding: 0 10px;
+    }
+
+    .n20-num-w {
+      .el-input,
+      .el-input__inner {
+        padding-left: 0;
+      }
+    }
+    &-close {
+      display: none;
+      position: absolute;
+      top: -6px;
+      right: -10px;
+    }
+    &:hover {
+      .n20-advanced-filter-item-close {
+        display: inline-block;
+      }
+    }
+  }
+  &-content {
+    display: inline-block;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+  :hover {
+    border-color: $--color-primary;
+    cursor: pointer;
+  }
+  &-add {
+    display: inline-block;
+    vertical-align: middle;
+  }
+}
+
+.popover-check-box {
+  max-height: 300px;
+  overflow-y: auto;
+}

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

@@ -26,9 +26,10 @@
 }
 
 // @import url('//at.alicdn.com/t/c/font_3862271_abu3srabchf.css');
+// @import url('../iconFont2/iconfont.css');
 @import url('../iconFont2/iconfont.css');
-
 @import url('../iconFont3/iconfont.css');
+@import url('../iconFont4/iconfont.css');
 
 .iconfont {
   font-family: 'iconfont' !important;

package/src/assets/css/normalize.scss

@@ -612,6 +612,13 @@ iframe {
   }
 }
 
+.auto-width-input {
+  width: fit-content;
+}
+.width-auto {
+  width: auto !important;
+}
+
 /* 宽高范围是 60-1000- */
 $list: 45, 60, 80, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 220, 230, 240, 250, 260, 270, 280, 290,
   300, 400, 500, 600, 700, 800, 900, 1000;

package/src/assets/css/select.scss

@@ -47,3 +47,12 @@
     }
   }
 }
+
+/* 设置 el-select 条目最大宽度 */
+.el-select.input-w {
+  .el-select__tags {
+    .el-tag--info {
+      max-width: 150px;
+    }
+  }
+}