@lambo-design/workflow-approve 1.0.0-beta.142 → 1.0.0-beta.144

package/package.json

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

package/src/components/assignee-box.vue

@@ -11,8 +11,8 @@
           </div>
         </div>
         <div class="org-detil">
-          <LamboPagingTable :key="useTransferRangeUsers" ref="selection" highlight-row :data="tableData" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams" :height="tableHeight" :width="tableWidth"
-                            @on-selection-change="onSelectionChange" @on-current-change="onCurrentChange" :page-disable="useTransferRangeUsers" :showTableOption="!useTransferRangeUsers" :stripe="false">
+          <LamboPagingTable :key="tableRenderKey" ref="selection" highlight-row :data="tableData" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams" :height="tableHeight" :width="tableWidth"
+                            @on-selection-change="onSelectionChange" @on-current-change="onCurrentChange" :page-disable="useTransferRangeUsers" :showTableOption="!useTransferRangeUsers" :stripe="false">
             <div slot="search" v-if="!useTransferRangeUsers">
               <Form :label-width="60" label-colon>
                 <Row>
@@ -105,8 +105,9 @@ export default {
       permScope: 'all',
       modalBoxShow: false,
       dataUrl:'',
-      tableData:[],
-      helpBoxColumns: [
+      tableData:[],
+      tableRenderKey: 0,
+      helpBoxColumns: [
         {
           title: "用户ID",
           key: "userId",
@@ -230,22 +231,39 @@ export default {
     }
   },
   inject: ['toBeDoneListDoSearch'],
-  methods: {
-    init (organTreeType) {
-      let self = this
-      self.organTreeType = organTreeType
-      self.getRootData(organTreeType)
-    },
-    clearData(){
-      this.idSelectedArr = []
-      this.useTransferRangeUsers = false
-      //清除表格数据
-      this.doSearch()
-    },
-    toggleShowHelpBox(organTreeType, permScope, helpBoxType, id, data, title) {
-      this.clearData()
-      this.id = id
-      this.title = title
+  methods: {
+    init (organTreeType) {
+      let self = this
+      self.organTreeType = organTreeType
+      self.getRootData(organTreeType)
+    },
+    resetBoxState(){
+      this.tableRenderKey += 1
+      this.idSelectedArr = []
+      this.currentNode = {}
+      this.treeData = []
+      this.tableData = []
+      this.tableSearchParams = {}
+      this.dataUrl = ''
+      this.useTransferRangeUsers = false
+      this.useTransferRangeOrgan = false
+      this.permScopeList = 'all'
+      this.form = {
+        userId: '',
+        userName: '',
+        organId: '',
+        organTitle: '',
+        directChild: false,
+        isAdmin: ''
+      }
+    },
+    clearData(){
+      this.resetBoxState()
+    },
+    toggleShowHelpBox(organTreeType, permScope, helpBoxType, id, data, title) {
+      this.clearData()
+      this.id = id
+      this.title = title
       this.helpBoxType = helpBoxType
       this.organTreeType = organTreeType
       if (helpBoxType === 'appointHandlerWithCandGroups'){
@@ -751,13 +769,14 @@ export default {
       }
     },
 
-    onCancel () {
-      if (this.helpBoxType === 'auditTo82'){
-        this.$emit('update-selected', ''); // 触发事件并传递 userId
-      }
-      this.modalBoxShow = false;
-
-    },
+    onCancel () {
+      if (this.helpBoxType === 'auditTo82'){
+        this.$emit('update-selected', ''); // 触发事件并传递 userId
+      }
+      this.resetBoxState()
+      this.modalBoxShow = false;
+
+    },
 
     getSystemConfig(){
       const self = this
@@ -776,25 +795,26 @@ export default {
 </script>
 
 <style lang="less" scope>
-.org-info{
-  display: flex;
-  max-height: 700px;
-  .org-tree {
-    width: 265px;
-    min-height: 450px;
-    border-right: 1px solid #dcdee2;
-    .tree-content {
-      height: 100%;
-      overflow-y: auto;
-    }
-  }
-
-  .org-detil {
-    flex:1;
-    min-height: 400px;
-    min-width: 800px;
-    padding: 0 10px 10px;
-    margin-left: 10px;
-  }
-}
+.org-info{
+  display: flex;
+  height: auto;
+  max-height: none;
+  .org-tree {
+    width: 265px;
+    min-height: 0;
+    border-right: 1px solid #dcdee2;
+    .tree-content {
+      height: auto;
+      overflow-y: auto;
+    }
+  }
+
+  .org-detil {
+    flex:1;
+    min-height: 0;
+    min-width: 800px;
+    padding: 0 10px 10px;
+    margin-left: 10px;
+  }
+}
 </style>

package/src/components/history.vue

@@ -30,7 +30,7 @@
           <!-- 检查是否有待审批记录 -->
           <template v-if="items.some(item => isPendingAudit(item))">
             <!-- 待审批的记录：使用折叠面板 -->
-            <Collapse v-model="pendingActiveName" simple style="margin: -10px 0 0 20px;border: none">
+            <Collapse :key="'pending-collapse-' + index + '-' + sortBy" v-model="pendingActiveName" simple style="margin: -10px 0 0;border: none">
               <Panel :name="'pending-panel' + index" hide-arrow>
                  <span class="pending-audit-title">
                    <Icon type="md-time" style="color: orange; margin-right: 5px;" />
@@ -526,7 +526,7 @@ export default {
         }
       ],
       sortBy: this.historySortBy,
-      pendingActiveName: [], // 控制待审批折叠面板的展开状态
+      pendingActiveName: '', // 控制待审批折叠面板的展开状态
     }
   },
   computed: {
@@ -993,6 +993,7 @@ export default {
     },
     toggleSortBy(by) {
       this.sortBy = by;
+      this.pendingActiveName = '';
     },
     isPendingAudit(item) {
       // 判断是否为待审批状态
@@ -1056,20 +1057,18 @@ export default {
   align-items: center;
 }
 
-/* 按时间排序的卡片样式 - 更小，不遮挡时间轴圆点 */
 .portrait-card-time {
-  margin-left: 20px !important;
-  margin-right: 10px !important;
-  margin-bottom: 8px !important;
-  background-color: #fafafa !important;
+  width: 100%;
+  max-width: 100%;
+  margin-left: 0 !important;
+  margin-right: 0 !important;
+  margin-bottom: 5px !important;
+  box-sizing: border-box;
+  overflow: hidden;
 }
 
 :deep(.portrait-card-time .ivu-card-body) {
-  padding: 8px 12px !important;
-}
-
-:deep(.portrait-card-time .ivu-list-item) {
-  padding: 6px 0 !important;
+  padding: 5px !important;
 }
 
 :deep(.docx) {