n20-common-lib 1.2.13 → 1.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.2.13",
+  "version": "1.2.16",
   "private": false,
   "main": "src/index.js",
   "scripts": {

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

@@ -117,7 +117,8 @@ $--input-max: 304px;
 .el-form.label-width-6em {
   margin-left: 96px;
   margin-right: 14px;
-  .n20-title {
+  .n20-title,
+  .n20-in-block {
     margin-left: -96px;
     margin-right: -14px;
   }
@@ -154,7 +155,8 @@ $--input-max: 304px;
 .el-form.label-width-8em {
   margin-left: 66px;
   margin-right: 38px;
-  .n20-title {
+  .n20-title,
+  .n20-in-block {
     margin-left: -66px;
     margin-right: -38px;
   }
@@ -191,7 +193,8 @@ $--input-max: 304px;
 .el-form.label-width-10em {
   margin-left: 40px;
   margin-right: 70px;
-  .n20-title {
+  .n20-title,
+  .n20-in-block {
     margin-left: -40px;
     margin-right: -70px;
   }
@@ -228,7 +231,8 @@ $--input-max: 304px;
 .el-form.label-width-12em {
   margin-left: 10px;
   margin-right: 96px;
-  .n20-title {
+  .n20-title,
+  .n20-in-block {
     margin-left: -10px;
     margin-right: -96px;
   }
@@ -265,7 +269,8 @@ $--input-max: 304px;
 .el-form.label-width-14em {
   margin-left: 0px;
   margin-right: 96px;
-  .n20-title {
+  .n20-title,
+  .n20-in-block {
     margin-left: 0px;
     margin-right: -96px;
   }
@@ -302,7 +307,8 @@ $--input-max: 304px;
 .el-form.label-width-16em {
   margin-left: 0px;
   margin-right: 98px;
-  .n20-title {
+  .n20-title,
+  .n20-in-block {
     margin-left: 0px;
     margin-right: -96px;
   }

package/src/assets/css/cl-secondary-tab.scss

@@ -10,11 +10,23 @@
     height: 27px;
     line-height: 26px;
     padding: 0 10px;
-    &.is-disabled {
-      cursor: no-drop;
-    }
     &.is-active {
       font-weight: 500;
+      &::after {
+        content: '';
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        height: 2px;
+        width: 100%;
+        background-color: $--color-primary;
+      }
+    }
+    &.is-disabled {
+      cursor: no-drop;
+      &::after {
+        background-color: $--color-text-placeholder;
+      }
     }
   }
 
@@ -33,7 +45,6 @@
     }
   }
   .el-tabs__active-bar {
-    transition: none;
+    display: none;
   }
-
 }

package/src/components/FileExportAsync/index.vue

@@ -46,7 +46,7 @@ export default {
     },
     waitTime: {
       type: Number,
-      default: 10000
+      default: 5000
     }
   },
   data() {
@@ -128,6 +128,10 @@ export default {
 
         downloadBlob(data, this.fileName)
         this.pgsV = false
+        let confirmBtn = document.querySelector(
+          '.ex-waitime-msg .el-button--primary'
+        )
+        confirmBtn && confirmBtn.click()
       })
     },
     // 导出取消
@@ -159,7 +163,7 @@ export default {
           title: '提示',
           message: '您的数据导出时间可能会比较长，是否继续导出？',
           type: 'warning',
-          customClass: 'question',
+          customClass: 'question ex-waitime-msg',
           confirmButtonText: '继续导出',
           cancelButtonText: '取消'
         }).catch(() => {

package/src/directives/VTitle/index.js

@@ -4,7 +4,8 @@ let timer = undefined
 
 function tipShow(el, tip) {
   if (el.$tooltipTitle) {
-    if (!el.$tooltipTitleOverflow || el.clientWidth < el.scrollWidth) {
+    let _el = el.querySelector('.el-input__inner') || el
+    if (!el.$tooltipTitleOverflow || _el.clientWidth < _el.scrollWidth) {
       tip.title = el.$tooltipTitle
       tip.$refs['title-pop'].referenceElm = el
       tip.$refs['title-pop'].doDestroy()
@@ -22,6 +23,7 @@ function tipShow(el, tip) {
 }
 function tipHide(el, tip) {
   tip.visible = false
+  clearInterval(timer)
 }
 
 const TitleDirective = {}
@@ -57,6 +59,7 @@ TitleDirective.install = (Vue) => {
       el.$tooltipHide()
       el.removeEventListener('mouseenter', el.$tooltipShow)
       el.removeEventListener('mouseleave', el.$tooltipHide)
+      clearInterval(timer)
     }
   })
 }