From 27d6ff04382d95f360e4dc18769a9bd36dfca4b4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 六月 2024 15:08:16 +0800
Subject: [PATCH] 2024-06-03
---
src/menu/components/search/main-search/index.jsx | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/menu/components/search/main-search/index.jsx b/src/menu/components/search/main-search/index.jsx
index cd9612d..07a0c93 100644
--- a/src/menu/components/search/main-search/index.jsx
+++ b/src/menu/components/search/main-search/index.jsx
@@ -120,19 +120,19 @@
this.props.updateConfig(component)
}
- checkComponent = (component) => {
- this.updateComponent(component)
+ // checkComponent = (component) => {
+ // this.updateComponent(component)
- let _item = null
- component.search.forEach(item => {
- if (!_item && item.focus) {
- _item = item
- }
- })
- if (_item) {
- this.handleSearch(_item)
- }
- }
+ // let _item = null
+ // component.search.forEach(item => {
+ // if (!_item && item.focus) {
+ // _item = item
+ // }
+ // })
+ // if (_item) {
+ // this.handleSearch(_item)
+ // }
+ // }
/**
* @description 鎼滅储鏉′欢椤哄簭璋冩暣锛屾垨鎷栨嫿娣诲姞
@@ -255,7 +255,8 @@
sqlVerifing: true
})
- let sql = res.dataSource
+ let sql = `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)
+ ${res.dataSource}`
sql = sql.replace(/@\$|\$@/ig, '')
let rduri = ''
@@ -345,6 +346,7 @@
_card.search.push(item)
this.updateComponent(_card)
+ this.handleSearch(item)
} else if (type === 'multil') {
_card.search.push(...item)
@@ -353,9 +355,9 @@
}
getWrapForms = () => {
- const { wrap, action } = this.state.card
+ const { card } = this.state
- return getWrapForm(wrap, action)
+ return getWrapForm(card.wrap, card.uuid)
}
updateWrap = (res) => {
@@ -379,7 +381,7 @@
let _style = resetStyle(card.style)
return (
- <div className={`main-search-edit-list ${card.wrap.float} ${showField ? 'show-field' : ''}`} onClick={this.clickComponent} id={card.uuid} style={_style}>
+ <div className={`main-search-edit-list ${card.wrap.float} ${showField ? 'show-field' : ''} mk-size-${card.wrap.searchSize || ''}`} onClick={this.clickComponent} id={card.uuid} style={_style}>
<FieldsComponent config={card} type="search" />
<Switch checkedChildren="寮�" size="small" unCheckedChildren="鍏�" defaultChecked={showField} onChange={this.onFieldChange} />
<DragElement
@@ -396,7 +398,8 @@
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<CopyComponent type="mainsearch" card={card}/>
- <PasteComponent config={card} options={['search', 'form']} updateConfig={this.checkComponent} />
+ {/* <PasteComponent config={card} options={['search', 'form']} updateConfig={this.checkComponent} /> */}
+ <PasteComponent config={card} options={['search', 'form']} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<DeleteOutlined className="close" onClick={() => this.props.deletecomponent(card.uuid)} />
</div>
--
Gitblit v1.8.0