From ea06034e06a30d3e97838c7885ae7694273a8ca1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 05 十二月 2024 20:03:51 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/module/voucher/resetAttach/documents/index.jsx | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/custom/components/module/voucher/resetAttach/documents/index.jsx b/src/tabviews/custom/components/module/voucher/resetAttach/documents/index.jsx
index ea36b1c..723db38 100644
--- a/src/tabviews/custom/components/module/voucher/resetAttach/documents/index.jsx
+++ b/src/tabviews/custom/components/module/voucher/resetAttach/documents/index.jsx
@@ -1,4 +1,5 @@
import React, {Component} from 'react'
+import { fromJS } from 'immutable'
class Documents extends Component {
state = {
@@ -7,9 +8,16 @@
}
UNSAFE_componentWillMount() {
- const { documents } = this.props
+ const { documents, list } = this.props
- let actFolder = documents[0] || null
+ let actFolder = null
+
+ if (documents[0]) {
+ actFolder = fromJS(documents[0]).toJS()
+
+ let ids = list.map(item => item.id)
+ actFolder.attachments = actFolder.attachments.filter(doc => !ids.includes(doc.id))
+ }
this.setState({selectKey: [], actFolder: actFolder})
}
@@ -31,15 +39,17 @@
}
checkfolder = (id) => {
- const { documents } = this.props
+ const { documents, list } = this.props
const { actFolder } = this.state
if (!actFolder || actFolder.id === id) return
let _actFolder = null
+ let ids = list.map(item => item.id)
documents.forEach(item => {
if (item.id === id) {
- _actFolder = item
+ _actFolder = fromJS(item).toJS()
+ _actFolder.attachments = _actFolder.attachments.filter(doc => !ids.includes(doc.id))
}
})
--
Gitblit v1.8.0