From 1bec8d69cf14bd88591eee5b0320c5c8f6c25a08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 三月 2024 21:19:31 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/searchcomponent/index.jsx | 38 +++++++-------------------------------
1 files changed, 7 insertions(+), 31 deletions(-)
diff --git a/src/menu/components/share/searchcomponent/index.jsx b/src/menu/components/share/searchcomponent/index.jsx
index e03d2e9..6752638 100644
--- a/src/menu/components/share/searchcomponent/index.jsx
+++ b/src/menu/components/share/searchcomponent/index.jsx
@@ -2,13 +2,9 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Modal, notification } from 'antd'
-import moment from 'moment'
import MKEmitter from '@/utils/events.js'
import Api from '@/api'
-import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import { getSearchForm } from '@/templates/zshare/formconfig'
import SearchForm from '@/templates/sharecomponent/searchcomponent/searchform'
@@ -24,7 +20,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
searchlist: null, // 鎼滅储鏉′欢闆�
sqlVerifing: false, // sql楠岃瘉涓�
visible: false, // 妯℃�佹鎺у埗
@@ -156,7 +151,6 @@
this.searchFormRef.handleConfirm().then(res => {
let fieldrepet = false // 瀛楁閲嶅
- let labelrepet = false // 鎻愮ず鏂囧瓧閲嶅
_searchlist = _searchlist.filter(item => !item.origin || item.uuid === res.uuid) // 鍘婚櫎绯荤粺椤�
@@ -184,8 +178,6 @@
if (setFields.length < itemFields.length + resFields.length && (res.type !== 'date' || item.type !== 'date')) {
fieldrepet = true
- } else if (item.label === res.label) {
- labelrepet = true
}
}
@@ -203,13 +195,6 @@
duration: 5
})
return
- } else if (labelrepet) {
- notification.warning({
- top: 92,
- message: '鍚嶇О宸插瓨鍦�!',
- duration: 5
- })
- return
}
if (['select', 'multiselect', 'link', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
@@ -217,24 +202,16 @@
sqlVerifing: true
})
- let param = {
- func: 's_debug_sql',
- exec_type: 'y',
- LText: res.dataSource
- }
+ let sql = res.dataSource
+ sql = sql.replace(/@\$|\$@/ig, '')
- 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 = Utils.formatOptions(param.LText)
- param.secretkey = Utils.encrypt('', param.timestamp)
-
+ let rduri = ''
if (window.GLOB.mainSystemApi && res.database === 'sso') {
- param.rduri = window.GLOB.mainSystemApi
+ rduri = window.GLOB.mainSystemApi
}
- Api.genericInterface(param).then(result => {
- if (result.status) {
+ Api.sDebug(sql, rduri).then(result => {
+ if (result.status || result.ErrCode === '-2') {
this.setState({
sqlVerifing: false,
searchlist: _searchlist,
@@ -286,7 +263,7 @@
}
render() {
- const { dict, searchlist, visible, sqlVerifing } = this.state
+ const { searchlist, visible, sqlVerifing } = this.state
return (
<div className={'model-custom-header-search-list search-length' + (searchlist.length)}>
@@ -308,7 +285,6 @@
destroyOnClose
>
<SearchForm
- dict={dict}
card={this.state.card}
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
--
Gitblit v1.8.0