From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/components/share/searchcomponent/index.jsx | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/share/searchcomponent/index.jsx b/src/menu/components/share/searchcomponent/index.jsx
index 62f1391..27a0c1b 100644
--- a/src/menu/components/share/searchcomponent/index.jsx
+++ b/src/menu/components/share/searchcomponent/index.jsx
@@ -64,12 +64,24 @@
MKEmitter.removeListener('addSearch', this.addSearch)
}
- addSearch = (cardId, element) => {
+ addSearch = (cardId, element, type) => {
if (cardId !== this.props.config.uuid) return
const { searchlist } = this.state
- this.setState({searchlist: [...searchlist, element]})
+ if (type === 'replace') {
+ delete element.focus
+ this.setState({
+ searchlist: searchlist.map(cell => {
+ if (cell.field && cell.field.toLowerCase() === element.field.toLowerCase()) {
+ return element
+ }
+ return cell
+ }),
+ })
+ } else {
+ this.setState({searchlist: [...searchlist, element]})
+ }
this.handleSearch(element)
}
@@ -247,19 +259,19 @@
*/
deleteElement = (card) => {
const { config } = this.props
- let _this = this
+ let that = this
confirm({
content: `纭畾鍒犻櫎 - ${card.label} 锛焋,
onOk() {
- let _searchlist = fromJS(_this.state.searchlist).toJS()
+ let _searchlist = fromJS(that.state.searchlist).toJS()
_searchlist = _searchlist.filter(item => item.uuid !== card.uuid)
- _this.setState({
+ that.setState({
searchlist: _searchlist
}, () => {
- _this.props.updatesearch({...config, search: _searchlist})
+ that.props.updatesearch({...config, search: _searchlist})
})
},
onCancel() {}
--
Gitblit v1.8.0