@lambo-design/workflow-approve 1.0.0-beta.93 → 1.0.0-beta.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.93",
+  "version": "1.0.0-beta.95",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/src/components/history.vue

@@ -362,6 +362,10 @@ export default {
       type: String,
       default: "审批"
     },
+    historySortBy: {
+      type: String,
+      default: "time"
+    },
     //横竖版样式不同
     portraitWidth: {
       type: Number,
@@ -390,7 +394,7 @@ export default {
       itemList: [],
       auditNameList: [],
       displayPushButton: false,
-      sortBy: 'time',
+      sortBy: this.historySortBy,
       pendingActiveName: [], // 控制待审批折叠面板的展开状态
     }
   },

package/src/components/process-info.vue

@@ -84,7 +84,7 @@
         <Card class="process-history" :style="processHistoryHeight" dis-hover :bordered="false"
               v-if="handleButtons && handleButtons.includes('auditHistory')">
           <processHistory :portrait-width="processInfoWidth" :list="processHistory" :done-page="isDetail"
-                          :push-button="pushButton"
+                          :push-button="pushButton" :history-sort-by="historySortBy"
                           :smart-flow-server-context="smartFlowServerContext"></processHistory>
         </Card>
       </div>
@@ -261,6 +261,11 @@ export default {
       type: Array,
       default: () => ([])
     },
+    //审批历史默认排序规则
+    historySortBy: {
+      type: String,
+      default: 'time'
+    },
     smartFlowServerContext: {
       type: String,
       default: '/api/smart-flow-server',

package/src/portrait.vue

@@ -55,6 +55,7 @@
                        :handle-buttons="handleButtons"
                        :process-history="processHistory"
                        :portrait-width="portraitWidth"
+                       :history-sort-by="historySortBy"
                        :smart-flow-server-context="smartFlowServerContext"
                        @upload-file="uploadFile"/>
         </div>
@@ -79,7 +80,7 @@
     </div>
 
     <!--  竖版  -->
-    <div v-if="!inHorizontal" class="portrait-lambo-indicator-card"
+    <div v-if="!inHorizontal" :class="['portrait-lambo-indicator-card',!isExpanded && 'is-expanded']"
          :style="{...pageContainerWithoutPadding, left: '0', width: isExpanded && showProcessInfo ? `calc(100% - ${portraitWidth+10}px)` : '99%'}">
       <!--   业务内容区插槽   -->
       <slot v-if="currentTab === 'business'" name="business-content"></slot>
@@ -100,7 +101,7 @@
     </a>
     <transition style="position: relative; overflow-x: hidden" v-if="showProcessInfo && !inHorizontal" name="draw" @before-enter="beforeFlowInfoEnter" @enter="flowInfoEnter"
                 @before-leave="beforeFlowInfoLeave" @leave="flowInfoLeave">
-      <lamboIndicatorCard v-show="isExpanded" class="portrait-lambo-indicator-card"
+      <LamboIndicatorCard v-show="isExpanded" class="portrait-lambo-indicator-card"
                           :style="{width: portraitWidth + 'px', right: '0', ...pageContainerWithoutPadding}" :hasExtend="false">
         <div slot="content-title">流程信息</div>
         <ProcessInfo ref="processInfo"
@@ -117,9 +118,10 @@
                      :handle-buttons="handleButtons"
                      :process-history="processHistory"
                      :portrait-width="portraitWidth"
+                     :history-sort-by="historySortBy"
                      :smart-flow-server-context="smartFlowServerContext"
                      @upload-file="uploadFile"/>
-      </lamboIndicatorCard>
+      </LamboIndicatorCard>
     </transition>
 
     <!--  节点跳转选择弹框  -->
@@ -368,6 +370,18 @@ export default {
       required: false,
       default: '',
     },
+    //审批历史默认排序规则
+    historySortBy: {
+      type: String,
+      required: false,
+      default: 'time'
+    },
+    //审批区展开状态
+    processInfoExpanded: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     //是否显示竖向布局
     inHorizontal: {
       type: Boolean,
@@ -415,7 +429,7 @@ export default {
   },
   data() {
     return {
-      isExpanded: true,
+      isExpanded: this.processInfoExpanded,
       footerHeight: 55,
       showProcessInfo: true,
       portraitWidth: 0,
@@ -580,6 +594,7 @@ export default {
         position: 'absolute',
         top: `${top}px`,
         height: `calc(100% - ${top + this.footerHeight}px)`,
+        minHeight: `calc(100% - ${top + this.footerHeight}px)`,
       }
       return style
     },
@@ -1212,13 +1227,13 @@ export default {
     },
     getNextNodes() {
       const self = this
-      self.nextNodesFormList = []
-      self.nextNodesOldSettings = []
       let param = {
         procId: this.procId,
         taskNode: this.taskNode
       }
       ajax.post(self.smartFlowServerContext + '/manage/processTodo/getNextNodes', param).then(function (resp) {
+        self.nextNodesFormList = []
+        self.nextNodesOldSettings = []
         if (resp.data.code === '200') {
           let nextNodeForm = {}
           let nextNodeOldForm = {}