n20-common-lib 2.7.0-beta.14 → 2.7.0-beta.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.0-beta.14",
+  "version": "2.7.0-beta.16",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/_coreLib.scss

@@ -1,3 +1,5 @@
+/* AdvancedFilter */
+@import './advanced-filter.scss';
 @import './cl-nav-menu.scss';
 @import './rootvar.scss';
 @import './font-icon.scss';
@@ -25,7 +27,8 @@
 @import './cl-footer-box.scss';
 @import './filter.scss';
 @import './cl-worn-pagination.scss';
-@import './cl-dialog.scss';
+/* Dialog */
+@import './dialog.scss';
 @import './cl-layout.scss';
 @import './cl-login-temporary.scss';
 @import './cl-showcolumn.scss';

package/src/assets/css/advanced-filter.scss

@@ -0,0 +1,216 @@
+.n20-advanced-filter {
+  position: relative;
+  display: flex;
+  align-items: center;
+  flex: 1;
+  padding: 8px 0;
+
+  &-item.n20-advanced-filter-active {
+    border-color: #b3d0ff;
+    background: #e9f2ff !important;
+  }
+
+  &-body {
+  }
+
+  &-item {
+    position: relative;
+    display: inline-block;
+    vertical-align: middle;
+    max-width: 426px;
+    margin-right: 8px;
+    padding-left:8px;
+    border-radius: 4px;
+    border: 1px solid #dcdfe5;
+    background: #fff;
+    cursor: pointer;
+
+    &__name {
+      display: inline-block;
+      vertical-align: middle;
+      white-space: nowrap;
+      overflow: hidden;
+      max-width: 168px;
+      margin-right: 6px;
+      color: #182b50;
+    }
+
+    &__value {
+      display: inline-block;
+      vertical-align: middle;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      max-width: 312px;
+      //margin-right: 14px;
+      .el-input .el-input__inner{
+        border:none;
+        padding-left: 0;
+        background-color: transparent;
+      }
+      .el-input__inner:focus {
+        box-shadow: none;
+      }
+
+    }
+    .filter_remove {
+      display: none;
+      position: absolute;
+      height: 13px;
+      width: 13px;
+      background: #f1f1f1;
+      right: -5px;
+      top: -7px;
+      font-size: 14px;
+      z-index: 1;
+      border-radius: 50%;
+      cursor: pointer;
+    }
+    &:hover {
+      .filter_remove {
+        display: block;
+      }
+    }
+
+
+    //
+    //.el-form-item__label {
+    //  padding: 0;
+    //  display: inline-block;
+    //  vertical-align: middle;
+    //  white-space: nowrap;
+    //  overflow: hidden;
+    //  text-overflow: ellipsis;
+    //  margin-right: 4px;
+    //}
+    //
+    //
+    //.el-range-editor.el-input__inner {
+    //  min-width: 168px;
+    //  max-width: 224px;
+    //
+    //  .el-range-input {
+    //    background-color: transparent;
+    //  }
+    //}
+    //
+    //.n20-date-editor.el-date-editor--datetimerange.el-range-editor--small.has-value {
+    //  min-width: 168px;
+    //  max-width: 380px;
+    //}
+    //
+    //.n20-date-editor .el-input__prefix {
+    //  display: none;
+    //}
+    //
+    //.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 {
+    //  padding-left: 5px;
+    //
+    //  .el-input,
+    //  .el-input__inner {
+    //    padding-left: 0;
+    //  }
+    //
+    //  .el-input--suffix .el-input__inner {
+    //    padding-right: 26px;
+    //  }
+    //}
+    //
+    //.n20-numberRange {
+    //  padding-right: 8px;
+    //}
+    //
+    //&-close {
+    //  display: none;
+    //  position: absolute;
+    //  top: -6px;
+    //  right:-20px;
+    //}
+    //
+    //&:hover {
+    //  .n20-advanced-filter-item-close {
+    //    display: inline-block;
+    //  }
+    //}
+  }
+
+  &-item.el-form-item[disabled] {
+    background-color: #f5f5f5 !important;
+    border-color: #e4e7ed !important;
+    color: #333333 !important;
+    cursor: not-allowed;
+  }
+
+  &-item.el-form-item.is-error {
+    border-color: #f56c6c !important;
+
+    input::placeholder {
+      color: #f56c6c !important;
+    }
+  }
+
+  &-content {
+    display: inline-block;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+
+    .el-select.el-select--small {
+      .el-select__tags {
+        max-width: 88px !important;
+        display: flex;
+        flex-wrap: nowrap;
+      }
+    }
+
+    .n20-date-editor.el-date-editor--datetimerange.el-range-editor--small.has-value {
+      min-width: 168px;
+      max-width: 380px;
+
+    }
+
+    .el-range-editor.el-input__inner {
+      padding: 3px 30px 3px 0px;
+    }
+
+    .el-select .el-tag.el-tag--info {
+      background: #E1F0FF
+    }
+  }
+
+  :hover {
+    border-color: $--color-primary;
+    cursor: pointer;
+  }
+
+  &-add {
+    display: inline-block;
+    vertical-align: middle;
+  }
+}

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

@@ -329,7 +329,7 @@ $--header-color: #3d4a57;
 
   &-first-item {
     flex: 0 0 33.33%;
-    margin-bottom: 16px;
+    margin-bottom: 8px;
 
     &_title {
 
@@ -348,4 +348,6 @@ $--header-color: #3d4a57;
 .menu.show_drawer {
   max-height: calc(90vh - 50px);
   min-height: 350px;
+  overflow-y: auto;
+  padding-bottom: 20px;
 }

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

@@ -1,35 +1,45 @@
 .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;
@@ -37,19 +47,23 @@
     }
   }
 }
+
 .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;
@@ -59,6 +73,7 @@
       border-radius: 2px;
     }
   }
+
   &.is-active {
     .el-input__inner {
       border-color: $--border-color-base;
@@ -68,66 +83,81 @@
 
 .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/{cl-dialog.scss → dialog.scss}

@@ -70,13 +70,16 @@
   }
 }
 
-/* UI要求最小弹窗432*243px */
-// .el-dialog {
-//   min-height: 243px;
-// }
-// .el-dialog__body {
-//   min-height: 114px;
-// }
+/* 居中弹框 */
+[center-dialog] {
+  .el-dialog {
+    margin: 0 !important;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+  }
+}
+
 /* UI要求最大弹窗占屏幕85% */
 [max-dialog] {
   .el-dialog {

package/src/assets/css/filter.scss

@@ -3,184 +3,7 @@
   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: 8px;
-    }
-
-    .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;
-    }
-
-
-    .el-range-editor.el-input__inner {
-      min-width: 168px;
-      max-width: 224px;
-
-      .el-range-input {
-        background-color: transparent;
-      }
-    }
-
-    .n20-date-editor.el-date-editor--datetimerange.el-range-editor--small.has-value {
-      min-width: 168px;
-      max-width: 380px;
-    }
-
-    .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 {
-      padding-left: 5px;
-
-      .el-input,
-      .el-input__inner {
-        padding-left: 0;
-      }
-
-      .el-input--suffix .el-input__inner {
-        padding-right: 26px;
-      }
-    }
-
-    .n20-numberRange {
-      padding-right: 8px;
-    }
-
-    &-close {
-      display: none;
-      position: absolute;
-      top: -6px;
-      right: -10px;
-    }
-
-    &:hover {
-      .n20-advanced-filter-item-close {
-        display: inline-block;
-      }
-    }
-  }
-
-  &-item.el-form-item[disabled] {
-    background-color: #f5f5f5 !important;
-    border-color: #e4e7ed !important;
-    color: #333333 !important;
-    cursor: not-allowed;
-  }
-
-  &-item.el-form-item.is-error {
-    border-color: #f56c6c !important;
-
-    input::placeholder {
-      color: #f56c6c !important;
-    }
-  }
-
-  &-content {
-    display: inline-block;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-
-    .el-select.el-select--small {
-      .el-select__tags {
-        max-width: 88px !important;
-        display: flex;
-        flex-wrap: nowrap;
-      }
-    }
-
-    .n20-date-editor.el-date-editor--datetimerange.el-range-editor--small.has-value {
-      min-width: 168px;
-      max-width: 380px;
-
-    }
-
-    .el-range-editor.el-input__inner {
-      padding: 3px 30px 3px 0px;
-    }
-
-    .el-select .el-tag.el-tag--info {
-      background: #E1F0FF
-    }
-  }
-
-  :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

@@ -1,5 +1,4 @@
-// @import url('//at.alicdn.com/t/font_2782772_nx36qm02jr.css');
-@import url('../iconFont/iconfont.css');
+
 
 .n20-icon- {
   font-family: 'core-lib-iconfont' !important;
@@ -35,12 +34,8 @@
   margin-left: 5px;
 }
 
-// @import url('//at.alicdn.com/t/c/font_3862271_abu3srabchf.css');
-// @import url('../iconFont2/iconfont.css');
+@import url('../iconFont/iconfont.css');
 @import url('../iconFont2/iconfont.css');
-@import url('../iconFont3/iconfont.css');
-@import url('../iconFont4/iconfont.css');
-@import url('../iconFont5/iconfont.css');
 
 .iconfont {
   font-family: 'iconfont' !important;
@@ -53,4 +48,4 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -webkit-text-stroke-width: 0.2px;
-}
+}

package/src/assets/css/normalize.scss

@@ -284,6 +284,17 @@ iframe {
   }
 }
 
+.block {
+  display: block;
+}
+.inline_block {
+  display: inline-block;
+}
+
+.inline {
+  display: inline;
+}
+
 /* 文字居中 */
 .text {
   &-c {
@@ -850,4 +861,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) {
-  const _url = realUrl(url)
+export default function getJsonc(url, sync,rest) {
+  const _url = realUrl(url, rest)
   if (sync) {
     if (jsoncs[url + '?sync']) {
       return jsoncs[url + '?sync']