From c27d57333ed38c92f595219d2190ea63cef4d182 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 一月 2021 18:29:16 +0800
Subject: [PATCH] 2021-01-12
---
src/templates/sharecomponent/searchcomponent/index.jsx | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/index.jsx b/src/templates/sharecomponent/searchcomponent/index.jsx
index 73306fc..ae43ac0 100644
--- a/src/templates/sharecomponent/searchcomponent/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/index.jsx
@@ -48,7 +48,7 @@
if (!is(fromJS(nextProps.config.search), fromJS(this.props.config.search)) && !is(fromJS(nextProps.config.search), fromJS(searchlist))) {
let len = nextProps.config.search.length
let item = nextProps.config.search[len - 1]
- if (item.copyType && item.focus) {
+ if (item && item.focus) {
this.handleSearch(item)
}
this.setState({searchlist: fromJS(nextProps.config.search).toJS()})
@@ -174,14 +174,14 @@
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
@@ -194,6 +194,7 @@
let param = {
func: 's_debug_sql',
+ exec_type: 'y',
LText: res.dataSource
}
@@ -201,7 +202,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
@@ -277,7 +278,7 @@
const { dict, searchlist, visible, sqlVerifing, card } = this.state
return (
- <div className="model-table-search-list">
+ <div className={'model-table-search-list length' + searchlist.length}>
<Tooltip placement="bottomLeft" overlayClassName="middle" title={dict['model.tooltip.search.guide']}>
<Icon type="question-circle" />
</Tooltip>
@@ -290,7 +291,7 @@
/>
{/* 缂栬緫鎼滅储鏉′欢 */}
<Modal
- title={dict['model.searchCriteria'] + '-' + (card && card.copyType === 'search' ? dict['model.copy'] : dict['model.edit'])}
+ title={card && card.copyType === 'search' ? '鎼滅储鏉′欢-澶嶅埗' : '鎼滅储鏉′欢-缂栬緫'}
visible={visible}
width={850}
maskClosable={false}
--
Gitblit v1.8.0