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 | 50 +++++++++++++++++++++-----------------------------
1 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/index.jsx b/src/templates/sharecomponent/searchcomponent/index.jsx
index 2951024..f6e9073 100644
--- a/src/templates/sharecomponent/searchcomponent/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/index.jsx
@@ -2,10 +2,8 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Modal, notification, Switch } from 'antd'
-import moment from 'moment'
import Api from '@/api'
-import Utils from '@/utils/utils.js'
import { getSearchForm } from '@/templates/zshare/formconfig'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
@@ -44,12 +42,12 @@
componentDidMount () {
MKEmitter.addListener('plusSearch', this.plusSearch)
- MKEmitter.addListener('revert', this.revert)
+ // MKEmitter.addListener('revert', this.revert)
}
- revert = () => {
- this.setState({searchlist: fromJS(this.props.config.search).toJS()})
- }
+ // revert = () => {
+ // this.setState({searchlist: fromJS(this.props.config.search).toJS()})
+ // }
plusSearch = (MenuId, item, type) => {
const { config } = this.props
@@ -95,6 +93,7 @@
* @description 鎼滅储鏉′欢缂栬緫锛岃幏鍙栨悳绱㈡潯浠惰〃鍗曚俊鎭�
*/
handleSearch = (card) => {
+ const { config } = this.props
const { searchlist } = this.state
let linkableFields = []
@@ -110,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}
})
}
@@ -206,30 +205,17 @@
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 param = {
- func: 's_debug_sql',
- exec_type: 'y',
- LText: res.dataSource
- }
-
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
- param.LText = param.LText.replace(/\n/g, ' ')
+ let sql = `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)
+ ${res.dataSource}`
+ sql = sql.replace(/@\$|\$@/ig, '')
- param.LText = Utils.formatOptions(param.LText)
- param.secretkey = Utils.encrypt('', param.timestamp)
-
- if (window.GLOB.mainSystemApi && res.database === 'sso') {
- param.rduri = window.GLOB.mainSystemApi
- }
-
- Api.genericInterface(param).then(result => {
- if (result.status) {
+ Api.sDebug(sql).then(result => {
+ if (result.status || result.ErrCode === '-2') {
this.setState({
sqlVerifing: false,
searchlist: _searchlist,
@@ -321,7 +307,7 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('revert', this.revert)
+ // MKEmitter.removeListener('revert', this.revert)
MKEmitter.removeListener('plusSearch', this.plusSearch)
}
@@ -339,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
@@ -354,6 +345,7 @@
{/* 缂栬緫鎼滅储鏉′欢 */}
<Modal
title={card && card.copyType === 'search' ? '鎼滅储鏉′欢-澶嶅埗' : '鎼滅储鏉′欢-缂栬緫'}
+ wrapClassName="mk-scroll-modal"
visible={visible}
width={850}
maskClosable={false}
--
Gitblit v1.8.0