From ed719ec5d86d3373ee95df8262eba3f456f94d60 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 六月 2024 17:28:09 +0800
Subject: [PATCH] 2024-06-12
---
src/templates/sharecomponent/searchcomponent/index.jsx | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/index.jsx b/src/templates/sharecomponent/searchcomponent/index.jsx
index 9d4b8f3..f6e9073 100644
--- a/src/templates/sharecomponent/searchcomponent/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/index.jsx
@@ -93,6 +93,7 @@
* @description 鎼滅储鏉′欢缂栬緫锛岃幏鍙栨悳绱㈡潯浠惰〃鍗曚俊鎭�
*/
handleSearch = (card) => {
+ const { config } = this.props
const { searchlist } = this.state
let linkableFields = []
@@ -108,8 +109,8 @@
})
let columns = null
- if (this.props.config.type === 'table') {
- columns = this.props.config.columns.map(item => {
+ if (config.columns && config.columns.length) {
+ columns = config.columns.map(item => {
return {key: item.uuid, text: item.field, value: item.field, label: item.label}
})
}
@@ -204,20 +205,16 @@
return
}
- if (['checkcard', 'select', 'multiselect', 'link'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
+ if (['checkcard', 'select', 'multiselect', 'link'].includes(res.type) && res.resourceType === '1' && res.database !== 'sso' && /\s/.test(res.dataSource)) {
this.setState({
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 = ''
- if (window.GLOB.mainSystemApi && res.database === 'sso') {
- rduri = window.GLOB.mainSystemApi
- }
- Api.sDebug(sql, rduri).then(result => {
+ Api.sDebug(sql).then(result => {
if (result.status || result.ErrCode === '-2') {
this.setState({
sqlVerifing: false,
@@ -328,8 +325,13 @@
const { config } = this.props
const { searchlist, visible, sqlVerifing, card, showField, setVisible } = this.state
+ let size = ''
+ if (config.wrap && config.wrap.searchSize) {
+ size = ' mk-size-' + config.wrap.searchSize
+ }
+
return (
- <div className={'model-table-search-list length' + searchlist.length + (showField ? ' show-field' : '')}>
+ <div className={'model-table-search-list length' + searchlist.length + (showField ? ' show-field' : '') + size}>
<FieldsComponent config={{uuid: config.uuid, search: searchlist}} type="search" />
<Switch className="switch-field-show" checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={showField} onChange={this.onFieldChange} />
<DragElement
--
Gitblit v1.8.0