From 3b103caa6bfc9ed410e67156c3ca1785bf1cecc9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 19 八月 2022 01:15:31 +0800
Subject: [PATCH] 2022-08-19
---
src/templates/sharecomponent/searchcomponent/index.jsx | 118 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 82 insertions(+), 36 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/index.jsx b/src/templates/sharecomponent/searchcomponent/index.jsx
index dc0dd9e..2f848fc 100644
--- a/src/templates/sharecomponent/searchcomponent/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Tooltip, Modal, notification, Switch } from 'antd'
+import { Modal, notification, Switch } from 'antd'
import moment from 'moment'
import Api from '@/api'
@@ -9,13 +9,16 @@
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
import { getSearchForm } from '@/templates/zshare/formconfig'
-
+import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
-import SearchForm from './searchform'
import DragElement from './dragsearch'
+import SearchForm from './searchform'
+import SettingForm from './settingform'
import './index.scss'
const { confirm } = Modal
+
+const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent'))
class SearchComponent extends Component {
static propTpyes = {
@@ -25,11 +28,12 @@
state = {
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
- searchlist: null, // 鎼滅储鏉′欢闆�
- sqlVerifing: false, // sql楠岃瘉涓�
- visible: false, // 妯℃�佹鎺у埗
+ searchlist: null,
+ sqlVerifing: false,
+ visible: false,
showField: false,
- card: null // 缂栬緫涓厓绱�
+ setVisible: false,
+ card: null
}
/**
@@ -41,24 +45,13 @@
})
}
- /**
- * @description 鐩戝惉鍒版悳绱㈡潯浠跺鍒舵椂锛岃Е鍙戞悳绱㈡潯浠剁紪杈�
- */
- UNSAFE_componentWillReceiveProps (nextProps) {
- const { searchlist } = this.state
-
- 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 && item.focus) {
- this.handleSearch(item)
- }
- this.setState({searchlist: fromJS(nextProps.config.search).toJS()})
- }
- }
-
componentDidMount () {
MKEmitter.addListener('plusSearch', this.plusSearch)
+ MKEmitter.addListener('revert', this.revert)
+ }
+
+ revert = () => {
+ this.setState({searchlist: fromJS(this.props.config.search).toJS()})
}
plusSearch = (MenuId, item, type) => {
@@ -75,6 +68,8 @@
})
} else if (type === 'multil') {
let list = [...searchlist, ...item]
+ list = list.filter(item => !item.origin) // 鍘婚櫎绯荤粺椤�
+
this.setState({
searchlist: list
}, () => {
@@ -117,10 +112,17 @@
})
})
+ let columns = null
+ if (this.props.config.type === 'table') {
+ columns = this.props.config.columns.map(item => {
+ return {key: item.uuid, text: item.field, value: item.field, label: item.label}
+ })
+ }
+
this.setState({
visible: true,
card: card,
- formlist: getSearchForm(card, linkableFields)
+ formlist: getSearchForm(card, linkableFields, columns)
})
}
@@ -228,10 +230,10 @@
LText: res.dataSource
}
- param.LText = param.LText.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.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
if (window.GLOB.mainSystemApi && res.database === 'sso') {
@@ -299,6 +301,31 @@
})
}
+ handleSetting = () => {
+ this.setState({
+ setVisible: true
+ })
+ }
+
+ settingSubmit = () => {
+ const { config } = this.props
+
+ this.settingFormRef.handleConfirm().then(res => {
+ this.setState({
+ setVisible: false
+ })
+
+ let _config = null
+
+ if (config.wrap) { // 鑷畾涔夐〉闈able
+ _config = {...config, wrap: {...config.wrap, ...res}}
+ } else {
+ _config = {...config, setting: {...config.setting, ...res}}
+ }
+
+ this.props.updatesearch(_config)
+ })
+ }
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊
@@ -307,31 +334,35 @@
this.setState = () => {
return
}
+ MKEmitter.removeListener('revert', this.revert)
MKEmitter.removeListener('plusSearch', this.plusSearch)
}
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState)) || this.props.config.setting.show !== nextProps.config.setting.show
+ if (!is(fromJS(this.state), fromJS(nextState))) {
+ return true
+ } else if (this.props.config.wrap) {
+ return !is(fromJS(nextProps.config.wrap), fromJS(this.props.config.wrap))
+ } else {
+ return !is(fromJS(nextProps.config.setting), fromJS(this.props.config.setting))
+ }
}
render() {
const { config } = this.props
- const { dict, searchlist, visible, sqlVerifing, card, showField } = this.state
+ const { dict, searchlist, visible, sqlVerifing, card, showField, setVisible } = this.state
return (
- <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>
- <Switch checkedChildren={dict['model.switch.open']} unCheckedChildren={dict['model.switch.close']} defaultChecked={showField} onChange={this.onFieldChange} />
+ <div className={'model-table-search-list length' + searchlist.length + (showField ? ' show-field' : '')}>
+ <FieldsComponent config={{uuid: config.uuid, search: searchlist}} type="search" />
+ <Switch className="switch-field-show" checkedChildren={dict['model.switch.open']} unCheckedChildren={dict['model.switch.close']} defaultChecked={showField} onChange={this.onFieldChange} />
<DragElement
list={searchlist}
- show={config.setting.show}
- showField={showField}
+ setting={config.wrap || config.setting}
handleList={this.handleList}
handleMenu={this.handleSearch}
deleteMenu={this.deleteElement}
- placeholder={dict['header.form.search.placeholder']}
+ handleSetting={this.handleSetting}
/>
{/* 缂栬緫鎼滅储鏉′欢 */}
<Modal
@@ -352,6 +383,21 @@
wrappedComponentRef={(inst) => this.searchFormRef = inst}
/>
</Modal>
+ <Modal
+ title={'鎼滅储璁剧疆'}
+ visible={setVisible}
+ width={800}
+ maskClosable={false}
+ onOk={this.settingSubmit}
+ onCancel={() => this.setState({setVisible: false})}
+ destroyOnClose
+ >
+ <SettingForm
+ setting={config.wrap || config.setting}
+ inputSubmit={this.settingSubmit}
+ wrappedComponentRef={(inst) => this.settingFormRef = inst}
+ />
+ </Modal>
</div>
)
}
--
Gitblit v1.8.0