n20-common-lib 2.7.0-beta.2 → 2.7.0-beta.21

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']