n20-common-lib 2.4.38 → 2.4.40

package/package.json

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

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

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

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

@@ -1,7 +1,8 @@
-$--item-margin: 4px;
+$--item-margin: 0;
 $--item-radius: 4px;
-$--layout-margin-top: 0;
+$--layout-margin-top: 1px;
 $--item-hover-padding: 12px;
+$--tabs-item-margin: 4px;
 
 .tabs-nav-wrap {
   &.el-tabs--card > .el-tabs__header {
@@ -18,37 +19,78 @@ $--item-hover-padding: 12px;
     padding-top: $--layout-margin-top;
   }
   .el-tabs__item {
+    position: relative;
     height: $--tabsnav-height;
     line-height: $--tabsnav-height;
     padding-left: $--item-hover-padding !important;
     padding-right: $--item-hover-padding !important;
     margin-right: $--item-margin;
-    border-radius: $--item-radius $--item-radius 0 0;
-    background: $--button-default-border-color;
     border: none !important;
+    border-radius: $--item-radius $--item-radius 0 0;
+    background: $--body-background;
     font-weight: $--font-weight-primary;
+    &:not(:first-child) {
+      &::before {
+        content: '';
+        position: absolute;
+        top: 15%;
+        left: 0;
+        height: 60%;
+        border-left: 1px solid $--color-text-secondary;
+      }
+    }
+
     &:first-child {
-      margin-left: $--layou-margin;
+      margin-left: $--tabs-item-margin;
       .el-icon-close {
         display: none;
       }
     }
     &:last-child {
-      margin-right: $--layou-margin;
+      margin-right: $--tabs-item-margin;
     }
 
     &:hover {
       color: $--color-text-primary;
-      background: $--color-white;
-      font-weight: $--font-weight-bold;
+      background-color: rgba(255, 255, 255, 0.6);
+      font-weight: $--font-weight-primary;
+      backdrop-filter: blur(5px);
+      &::before {
+        content: '';
+        position: absolute;
+        top: 15%;
+        right: 0;
+        height: 70%;
+        border: none;
+      }
+    }
+    &:hover + .el-tabs__item::before {
+      content: '';
+      position: absolute;
+      top: 15%;
+      right: 0;
+      height: 70%;
+      border: none;
     }
 
     &.is-active {
       color: $--color-text-primary;
       background: $--color-white;
-      font-weight: $--font-weight-bold;
+      font-weight: $--font-weight-primary;
     }
 
+    &.is-active::before {
+      border: none;
+    }
+
+    &.is-active + .el-tabs__item::before {
+      content: '';
+      position: absolute;
+      top: 15%;
+      right: 0;
+      height: 70%;
+      border-left: none;
+    }
     &:focus.is-active.is-focus {
       box-shadow: none;
       border-radius: 0;
@@ -71,12 +113,12 @@ $--item-hover-padding: 12px;
   .el-tabs__nav-next,
   .el-tabs__nav-prev {
     width: 12px;
-    height: $--tabsnav-height - 2 * $--layou-margin;
-    line-height: $--tabsnav-height - 2 * $--layou-margin;
+    height: $--tabsnav-height - 2 * $--tabs-item-margin;
+    line-height: $--tabsnav-height - 2 * $--tabs-item-margin;
     border-radius: $--item-radius;
     background: $--color-white;
 
-    top: $--layou-margin;
+    top: $--tabs-item-margin;
     z-index: 9;
     &:hover {
       background: $--body-background;

package/src/components/ApprovalButtons/index.vue

@@ -14,13 +14,13 @@
         <el-form-item v-if="authList.includes('isAddtask')" :label="'加签' | $lc" :error="addMsg" class="flex-1 m-b-s">
           <label slot="label">
             <span>{{ '加签' | $lc }}</span>
-            <el-tooltip placement="top">
+            <!-- <el-tooltip placement="top">
               <span class="n20-icon-xinxitishi m-l-ss" style="position: static"></span>
               <div slot="content" style="width: 16em; line-height: 1.6">
                 {{ '会签并行：增加一个会签节点，全部审批人同意才可通过审批' | $lc }}<br />
                 {{ '普通串行：按照加签人数增加节点，每个节点审批通过才可完成当前加签流程' | $lc }}
               </div>
-            </el-tooltip>
+            </el-tooltip> -->
           </label>
           <div class="flex-box">
             <el-select
@@ -30,15 +30,20 @@
               clearable
               :placeholder="'请选择加签类型' | $lc"
               style="width: 10em"
-              @change="() => addTaskWay === '2' && addTaskType === '2' && (addTaskType = '3')"
             >
               <el-option :label="'向前加签' | $lc" value="2" />
               <el-option :label="'向后加签' | $lc" value="1" />
             </el-select>
-            <el-select v-model="addTaskType" clearable :placeholder="'请选择审批方式' | $lc" style="width: 10em">
-              <!-- <el-option :label="'普通节点' | $lc" value="1" /> -->
-              <el-option :label="'会签并行' | $lc" value="2" :disabled="addTaskWay === '2'" />
-              <el-option :label="'普通串行' | $lc" value="3" />
+            <el-select
+              v-model="addTaskType"
+              disabled
+              clearable
+              :placeholder="'请选择审批方式' | $lc"
+              style="width: 10em"
+            >
+              <el-option :label="'普通节点' | $lc" value="1" />
+              <!-- <el-option :label="'会签并行' | $lc" value="2" :disabled="addTaskWay === '2'" /> -->
+              <!-- <el-option :label="'普通串行' | $lc" value="3" /> -->
             </el-select>
             <el-input
               class="flex-item"
@@ -95,8 +100,10 @@
         />
       </el-form-item>
     </el-form>
-
-    <div class="text-c">
+    <div v-if="authList.includes('byAddTask') && addTaskList.length > 0" class="text-c">
+      <el-button v-if="authList.includes('approval')" type="primary" @click="approvalFn">{{ '加 签' | $lc }}</el-button>
+    </div>
+    <div v-else class="text-c">
       <el-button v-if="authList.includes('approval')" type="primary" @click="approvalFn">{{ '批 准' | $lc }}</el-button>
       <el-button v-if="showApprovalTo" type="primary" @click="approvalToV = true">{{ '批准至' | $lc }}</el-button>
       <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ '驳回至' | $lc }}</el-button>
@@ -250,7 +257,7 @@ export default {
       addMsg: undefined,
       setAddtaskV: false,
       addTaskList: [],
-      addTaskType: undefined,
+      addTaskType: '1',
       preAddTask: false,
       addTaskWay: undefined,
       rejectToV: false,

package/src/components/FileImport/index.vue

@@ -55,6 +55,10 @@ export default {
       type: Function,
       default: undefined
     },
+    customTemplateDownload: {
+      type: Function,
+      default: undefined
+    },
     validateResult: {
       type: Object,
       default: undefined
@@ -118,9 +122,13 @@ export default {
       })
     },
     downFn() {
-      axios.get(this.templateUrl, null, { responseType: 'blob', ...this.templateOpt }).then((blob) => {
-        downloadBlob(blob, this.fileName)
-      })
+      if (this.customTemplateDownload) {
+        this.customTemplateDownload()
+      } else {
+        axios.get(this.templateUrl, null, { responseType: 'blob', ...this.templateOpt }).then((blob) => {
+          downloadBlob(blob, this.fileName)
+        })
+      }
     }
   }
 }

package/src/components/Layout/TabsNav/index.vue

@@ -50,6 +50,8 @@ export default {
   },
   methods: {
     tabClick(C) {
+      console.log(C)
+
       let item = C.$attrs['tab-info']
       this.$emit('tab-click', item)
     },

package/src/components/Layout/index.vue

@@ -87,15 +87,15 @@ export default {
   },
   data() {
     let headerH = 48
-    let tabsH = 35
-    let clientM = 8
+    let tabsH = 28
+    let clientM = 4
 
     return {
       dnsKey: this.isTest || (process.env.NODE_ENV === 'production' && process.env.VUE_APP_KEEP_ALIVE === 'true'),
       headerH,
       tabsH,
       clientM,
-      clientHeight: document.documentElement.offsetHeight - headerH - tabsH - 2 * clientM,
+      clientHeight: document.documentElement.offsetHeight - headerH - tabsH - 1 * clientM,
       collapse: window.localStorage.getItem('aside-nav-collapse') === 'true',
 
       menusC: [],

package/src/components/Layout/indexN.vue

@@ -93,14 +93,14 @@ export default {
   data() {
     let headerH = 48
     let tabsH = 28
-    let clientM = 0
+    let clientM = 4
 
     return {
       dnsKey: this.isTest || (process.env.NODE_ENV === 'production' && process.env.VUE_APP_KEEP_ALIVE === 'true'),
       headerH,
       tabsH,
       clientM,
-      clientHeight: document.documentElement.offsetHeight - headerH - tabsH - 2 * clientM,
+      clientHeight: document.documentElement.offsetHeight - headerH - tabsH - 1 * clientM,
       collapse: window.localStorage.getItem('aside-nav-collapse') === 'true',
 
       menusC: [],

package/src/i18n.json

@@ -830,6 +830,9 @@
   "批准": {
     "en": "Approval"
   },
+  "加 签": {
+    "en": "Add signature"
+  },
   "消息中心": {
     "en": "Message center"
   },