From c98e45bfac25e9110ad0383faac54a54d98ea9d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 18 十一月 2021 20:47:04 +0800
Subject: [PATCH] 2021-11-18
---
src/menu/components/share/searchcomponent/index.jsx | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/src/menu/components/share/searchcomponent/index.jsx b/src/menu/components/share/searchcomponent/index.jsx
index 66c998f..5aa9876 100644
--- a/src/menu/components/share/searchcomponent/index.jsx
+++ b/src/menu/components/share/searchcomponent/index.jsx
@@ -1,7 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import {connect} from 'react-redux'
import { Modal, notification } from 'antd'
import moment from 'moment'
@@ -25,7 +24,7 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
searchlist: null, // 鎼滅储鏉′欢闆�
sqlVerifing: false, // sql楠岃瘉涓�
visible: false, // 妯℃�佹鎺у埗
@@ -198,26 +197,27 @@
if (fieldrepet) {
notification.warning({
top: 92,
- message: this.state.dict['model.field.exist'] + ' !',
+ message: '瀛楁宸插瓨鍦�!',
duration: 5
})
return
} else if (labelrepet) {
notification.warning({
top: 92,
- message: this.state.dict['model.name.exist'] + ' !',
+ message: '鍚嶇О宸插瓨鍦�!',
duration: 5
})
return
}
- if ((res.type === 'select' || res.type === 'multiselect' || res.type === 'link') && res.resourceType === '1' && /\s/.test(res.dataSource)) {
+ if (['select', 'multiselect', 'link', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
this.setState({
sqlVerifing: true
})
let param = {
func: 's_debug_sql',
+ exec_type: 'y',
LText: res.dataSource
}
@@ -225,7 +225,7 @@
param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
if (window.GLOB.mainSystemApi && res.database === 'sso') {
param.rduri = window.GLOB.mainSystemApi
@@ -264,11 +264,10 @@
*/
deleteElement = (card) => {
const { config } = this.props
- const { dict } = this.state
let _this = this
confirm({
- content: dict['model.confirm'] + dict['model.delete'] + ` - ${card.label} 锛焋,
+ content: `纭畾鍒犻櫎 - ${card.label} 锛焋,
onOk() {
let _searchlist = fromJS(_this.state.searchlist).toJS()
@@ -297,7 +296,7 @@
/>
{/* 缂栬緫鎼滅储鏉′欢 */}
<Modal
- title={dict['model.searchCriteria'] + '-' + dict['model.edit']}
+ title="鎼滅储鏉′欢-缂栬緫"
visible={visible}
width={850}
maskClosable={false}
@@ -319,14 +318,4 @@
}
}
-const mapStateToProps = (state) => {
- return {
- menu: state.customMenu
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(SearchComponent)
\ No newline at end of file
+export default SearchComponent
\ No newline at end of file
--
Gitblit v1.8.0