n20-common-lib 3.2.36 → 3.2.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.2.36",
+  "version": "3.2.38",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -11,6 +11,7 @@
     height: 27px;
     line-height: 26px;
     padding: 0 10px;
+
     &.is-active {
       font-weight: 500;
       &::after {

package/src/assets/css/v3/footer.scss

@@ -6,17 +6,23 @@
   background: $--color-white;
   justify-content: space-between;
 
+  .n20-page-footer-left,
+  .n20-page-footer-center,
+  .n20-page-footer-right {
+    flex: 1 1 auto;
+    min-width: 0;
+    display: flex;
+  }
+
   .n20-page-footer-left {
-    flex: 1;
+    justify-content: flex-start;
   }
 
   .n20-page-footer-center {
+    justify-content: center;
   }
 
   .n20-page-footer-right {
-    flex: 1;
-    width: 0;
-    display: flex;
     justify-content: flex-end;
   }
 }

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

@@ -20,11 +20,11 @@
     }
     .el-tabs__item {
       font-weight: 400;
+      color: $--color-text-regular;
       // height: 27px;
       font-family: 'PingFang SC';
       font-size: 14px;
       font-style: normal;
-      font-weight: 500;
       line-height: 26px;
       padding: 9px 16px;
 
@@ -35,7 +35,7 @@
           height: 2px;
           background-color: $--color-primary;
           display: block;
-          margin-top: 4px;
+          margin-top: 2px;
         }
       }
       &.is-disabled {
@@ -104,7 +104,9 @@
   line-height: 22px !important;
   padding: 8px 12px !important;
   border-radius: 4px !important;
-  box-shadow: 0 6px 16px -8px rgba(0, 0, 0, 0.08), 0 9px 28px 0 rgba(0, 0, 0, 0.05),
+  box-shadow:
+    0 6px 16px -8px rgba(0, 0, 0, 0.08),
+    0 9px 28px 0 rgba(0, 0, 0, 0.05),
     0 12px 48px 16px rgba(0, 0, 0, 0.03) !important;
   border: none !important;
 

package/src/components/ApprovalRecord/approvalImgPro/child.vue

@@ -133,6 +133,7 @@
 <script>
 import { $lc } from '../../../utils/i18n/index'
 import importG from '../../../utils/importGlobal.js'
+
 export default {
   filters: {
     zoomFormat(val) {
@@ -218,6 +219,20 @@ export default {
           }
         }
       })
+      for (let k in currAssMap) {
+        let submitter = currAssMap[k]
+        if (
+          !currentActivityIdList.includes(k) &&
+          !k.includes('@addTaskType') &&
+          typeof submitter === 'string' &&
+          submitter.trim()
+        ) {
+          let taskK = this.svgW.querySelector(`[data-element-id="${k}"]`)
+          if (taskK) {
+            this.addEvent(taskK, { assignee: `${$lc('发起人')}：${submitter.trim()}` }, 'pending')
+          }
+        }
+      }
       for (let k in taskDefIdMap) {
         if (!currentActivityIdList.includes(k)) {
           let taskK = this.svgW.querySelector(`[data-element-id="${k}"]`)

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -161,10 +161,12 @@
 </template>
 
 <script>
+import child from './child.vue'
+
 import axios from '../../../utils/axios.js'
 import { $lc } from '../../../utils/i18n/index'
 import importG from '../../../utils/importGlobal.js'
-import child from './child.vue'
+
 export default {
   components: {
     child
@@ -256,6 +258,20 @@ export default {
           }
         }
       })
+      for (let k in currAssMap) {
+        let submitter = currAssMap[k]
+        if (
+          !currentActivityIdList.includes(k) &&
+          !k.includes('@addTaskType') &&
+          typeof submitter === 'string' &&
+          submitter.trim()
+        ) {
+          let taskK = this.svgW.querySelector(`[data-element-id="${k}"]`)
+          if (taskK) {
+            this.addEvent(taskK, { assignee: `${$lc('发起人')}：${submitter.trim()}` }, 'pending')
+          }
+        }
+      }
       for (let k in taskDefIdMap) {
         if (!currentActivityIdList.includes(k)) {
           let taskK = this.svgW.querySelector(`[data-element-id="${k}"]`)

package/src/components/v3/Footer/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="n20-page-footer-v3" :style="showTopDivider ? 'border-top: 1px solid #E5E6EB;' : undefined">
-    <div :class="`n20-page-footer-left ${leftExtraClass}`">
+    <div v-if="$slots.leftExtra || $scopedSlots.leftExtra" :class="`n20-page-footer-left ${leftExtraClass}`">
       <slot name="leftExtra"></slot>
     </div>
-    <div :class="`n20-page-footer-center ${centerClass}`">
+    <div v-if="$slots.default || $scopedSlots.default" :class="`n20-page-footer-center ${centerClass}`">
       <slot></slot>
     </div>
-    <div :class="`n20-page-footer-right ${rightExtraClass}`">
+    <div v-if="$slots.rightExtra || $scopedSlots.rightExtra" :class="`n20-page-footer-right ${rightExtraClass}`">
       <slot name="rightExtra"></slot>
     </div>
   </div>