@lambo-design/workflow-approve 1.0.0-beta.6 → 1.0.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.8",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,7 +12,7 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/shared": "^1.0.0-beta.199",
+    "@lambo-design/shared": "^1.0.0-beta.200",
     "@lambo-design/core": "^4.7.1-beta.139"
   },
   "dependencies": {

package/src/components/horizontal/history.vue

@@ -4,16 +4,16 @@
     <Timeline class="horizontalTimeline">
       <TimelineItem v-for="(items,index) in itemList" :key="index" class="horizontalTimelineItem">
         <template #dot>
-          <img v-if="items[0].auditResult === '30'" style="zoom: 18%" class="imgStyle" src="@/assets/icons/tongguo1.png"
+          <img v-if="items[0].auditResult === '30'" style="zoom: 18%" class="imgStyle" src="../../static/icons/tongguo1.png"
                alt=""/>
           <img v-else-if="items[0].auditResult === '40'" style="zoom: 15%" class="imgStyle"
-               src="@/assets/icons/bohui1.png" alt=""/>
+               src="../../static/icons/bohui1.png" alt=""/>
           <img v-else-if="items[0].auditResult === '50'" style="zoom: 15%" class="imgStyle"
-               src="@/assets/icons/bohui1.png" alt=""/>
-          <img v-else-if="items[0].auditResult === '60'" class="imgStyle" src="@/assets/icons/bohui.png" alt=""/>
+               src="../../static/icons/bohui1.png" alt=""/>
+          <img v-else-if="items[0].auditResult === '60'" class="imgStyle" src="../../static/icons/bohui.png" alt=""/>
           <img v-else-if="items[0].auditResult === '80'" style="zoom: 18%" class="imgStyle"
-               src="@/assets/icons/tongguo1.png" alt=""/>
-          <img v-else style="zoom: 18%" class="imgStyle" src="@/assets/icons/daiban.png" alt=""/>
+               src="../../static/icons/tongguo1.png" alt=""/>
+          <img v-else style="zoom: 18%" class="imgStyle" src="../../static/icons/daiban.png" alt=""/>
         </template>
         <Collapse v-model="activeName" simple style="margin: -10px 0 0 -2px;border: none">
           <Panel :name="'panel' + index">

package/src/portrait.vue

@@ -4,7 +4,7 @@
       {{ title }}
     </template>
     <template slot="page-extend">
-      <Button type="primary" ghost @click="pageGoBack">返回</Button>
+      <slot name="return-button"></slot>
     </template>
     <div class="portrait-lambo-indicator-card" :style="{float: 'left', width: isExpanded ? `calc(100% - ${portraitWidth+10}px)` : '99%'}">
       <slot name="business-content">
@@ -88,7 +88,7 @@
         </a>
         <transition name="draw" @before-enter="beforeEnter" @enter="enter" @before-leave="beforeLeave" @leave="leave">
           <div class="box" v-show="historyShow">
-            <Card class="process-history" dis-hover :bordered="false"
+            <Card class="process-history" :style="processHistoryHeight" dis-hover :bordered="false"
                   v-if="!handleButtons || handleButtons.includes('auditHistory')">
               <processHistory :portrait-width="portraitWidth" :list="processHistory" :done-page="isDetail"
                               :smart-flow-server-context="smartFlowServerContext"></processHistory>
@@ -243,6 +243,7 @@ export default {
   props: {
     isDetail: {
       type: Boolean,
+      required: false,
       default: false
     },
     width: {
@@ -375,6 +376,15 @@ export default {
 
   },
   computed: {
+    processHistoryHeight(){
+      let str = '';
+      if ((!this.handleButtons || this.handleButtons.includes('auditOpinion') || this.handleButtons.includes('attachmentFile')) && (this.isDetail && this.hisAuditOpinion[0].auditOpinion)) {
+        str+= "height: 40vh"
+      }else {
+        str+= "height: 60vh"
+      }
+      return str;
+    },
     nodeColumn: function () {
       let column = []
       column.push({title: '序号', type: 'index', width: 70, align: 'center', fixed: 'left'});

package/src/styles/css/index.less

@@ -61,7 +61,6 @@
 }
 
 .process-history {
-  height: 40vh;
   width: 100%;
   overflow-y: auto;
 }